diff --git a/main/src/main/java/net/citizensnpcs/npc/ai/AStarNavigationStrategy.java b/main/src/main/java/net/citizensnpcs/npc/ai/AStarNavigationStrategy.java
index 833917798..e1fe6ea89 100644
--- a/main/src/main/java/net/citizensnpcs/npc/ai/AStarNavigationStrategy.java
+++ b/main/src/main/java/net/citizensnpcs/npc/ai/AStarNavigationStrategy.java
@@ -141,7 +141,7 @@ public class AStarNavigationStrategy extends AbstractPathStrategy {
         }
         Location loc = npc.getEntity().getLocation(NPC_LOCATION);
         /* Proper door movement - gets stuck on corners at times
-
+        
          Block block = currLoc.getWorld().getBlockAt(vector.getBlockX(), vector.getBlockY(), vector.getBlockZ());
           if (MinecraftBlockExaminer.isDoor(block.getType())) {
             Door door = (Door) block.getState().getData();
diff --git a/main/src/main/java/net/citizensnpcs/trait/VillagerProfession.java b/main/src/main/java/net/citizensnpcs/trait/VillagerProfession.java
index 99278dff1..c5c1e0250 100644
--- a/main/src/main/java/net/citizensnpcs/trait/VillagerProfession.java
+++ b/main/src/main/java/net/citizensnpcs/trait/VillagerProfession.java
@@ -30,7 +30,7 @@ public class VillagerProfession extends Trait {
     public void load(DataKey key) throws NPCLoadException {
         try {
             profession = Profession.valueOf(key.getString(""));
-            if (profession.name().equals("NORMAL")) {
+            if ("NORMAL".equals(profession.name())) {
                 profession = Profession.FARMER;
             }
         } catch (IllegalArgumentException ex) {
@@ -40,6 +40,8 @@ public class VillagerProfession extends Trait {
 
     @Override
     public void onSpawn() {
+        if (!npc.isSpawned())
+            return;
         if (npc.getEntity() instanceof Villager) {
             ((Villager) npc.getEntity()).setProfession(profession);
         } else if (npc.getEntity() instanceof ZombieVillager) {
@@ -53,15 +55,11 @@ public class VillagerProfession extends Trait {
     }
 
     public void setProfession(Profession profession) {
-        if (profession.name().equals("NORMAL")) {
+        if ("NORMAL".equals(profession.name())) {
             profession = Profession.FARMER;
         }
         this.profession = profession;
-        if (npc.getEntity() instanceof Villager) {
-            ((Villager) npc.getEntity()).setProfession(profession);
-        } else if (npc.getEntity() instanceof ZombieVillager) {
-            ((ZombieVillager) npc.getEntity()).setVillagerProfession(profession);
-        }
+        onSpawn();
     }
 
     @Override
diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/network/EmptyChannel.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/network/EmptyChannel.java
index 230e1d689..ffc618788 100644
--- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/network/EmptyChannel.java
+++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/network/EmptyChannel.java
@@ -19,7 +19,8 @@ public class EmptyChannel extends AbstractChannel {
     static {
         Map<String, Version> versionMap = Version.identify();
         Version nettyVersion = versionMap.get("netty-common");
-        if (nettyVersion == null) nettyVersion = versionMap.get("netty-all");
+        if (nettyVersion == null)
+            nettyVersion = versionMap.get("netty-all");
 
         if (nettyVersion != null) {
             String[] split = nettyVersion.artifactVersion().split("\\.");
@@ -31,10 +32,8 @@ public class EmptyChannel extends AbstractChannel {
                 if (major > 4 || minor > 1 || revision > 24) {
                     updatedNetty = true;
                 }
-            }
-            catch (ArrayIndexOutOfBoundsException ignored) {
-            }
-            catch (NumberFormatException ignored) {
+            } catch (ArrayIndexOutOfBoundsException ignored) {
+            } catch (NumberFormatException ignored) {
             }
         }
     }