diff --git a/src/main/java/net/citizensnpcs/npc/CitizensNPC.java b/src/main/java/net/citizensnpcs/npc/CitizensNPC.java
index 8e116daf9..796bbb957 100644
--- a/src/main/java/net/citizensnpcs/npc/CitizensNPC.java
+++ b/src/main/java/net/citizensnpcs/npc/CitizensNPC.java
@@ -78,7 +78,7 @@ public class CitizensNPC extends AbstractNPC {
 
     @Override
     public LivingEntity getBukkitEntity() {
-        return entityController.getBukkitEntity();
+        return entityController == null ? null : entityController.getBukkitEntity();
     }
 
     @Override
diff --git a/src/main/java/net/citizensnpcs/npc/entity/HorseController.java b/src/main/java/net/citizensnpcs/npc/entity/HorseController.java
index 519a01144..9d9533d04 100644
--- a/src/main/java/net/citizensnpcs/npc/entity/HorseController.java
+++ b/src/main/java/net/citizensnpcs/npc/entity/HorseController.java
@@ -29,7 +29,6 @@ public class HorseController extends MobEntityController {
 
     public static class EntityHorseNPC extends EntityHorse implements NPCHolder {
         private int jumpTicks;
-
         private final CitizensNPC npc;
 
         public EntityHorseNPC(World world) {