diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftCreature.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftCreature.java
index e4f263634a..f0d45c4704 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftCreature.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftCreature.java
@@ -24,6 +24,7 @@ public class CraftCreature extends CraftLivingEntity implements Creature {
 
     public CraftLivingEntity getTarget() {
         if (getHandle().target == null) return null;
+        if (!(getHandle().target instanceof CraftLivingEntity)) return null;
 
         return (CraftLivingEntity) getHandle().target.getBukkitEntity();
     }