diff --git a/src/main/java/noppes/npcs/controllers/CustomEffectController.java b/src/main/java/noppes/npcs/controllers/CustomEffectController.java
index 08d641a48..bf92b737f 100644
--- a/src/main/java/noppes/npcs/controllers/CustomEffectController.java
+++ b/src/main/java/noppes/npcs/controllers/CustomEffectController.java
@@ -506,7 +506,9 @@ public class CustomEffectController implements ICustomEffectHandler {
 
     @Override
     public boolean hasEffect(IPlayer player, ICustomEffect effect) {
-        return hasEffect((EntityPlayer) player, effect.getID(), effect.getIndex());
+        if (player == null || player.getMCEntity() == null)
+            return false;
+        return hasEffect((EntityPlayer) player.getMCEntity(), effect.getID(), effect.getIndex()));
     }
 
     @Override