diff --git a/src/main/java/net/citizensnpcs/command/command/NPCCommands.java b/src/main/java/net/citizensnpcs/command/command/NPCCommands.java
index b9aa9e651..4f4954174 100644
--- a/src/main/java/net/citizensnpcs/command/command/NPCCommands.java
+++ b/src/main/java/net/citizensnpcs/command/command/NPCCommands.java
@@ -671,8 +671,9 @@ public class NPCCommands {
         else if (args.hasFlag('r'))
             remove = true;
         npc.data().setPersistent("removefromplayerlist", remove);
-        NMS.addOrRemoveFromPlayerList(npc.getBukkitEntity(), remove);
-        Messaging.sendTr(sender, remove ? Messages.ADDED_TO_PLAYERLIST : Messages.REMOVED_FROM_PLAYERLIST,
+        if (npc.isSpawned())
+            NMS.addOrRemoveFromPlayerList(npc.getBukkitEntity(), remove);
+        Messaging.sendTr(sender, remove ? Messages.REMOVED_FROM_PLAYERLIST : Messages.ADDED_TO_PLAYERLIST,
                 npc.getName());
     }
 
diff --git a/src/main/java/net/citizensnpcs/util/NMS.java b/src/main/java/net/citizensnpcs/util/NMS.java
index cb535ec4d..93bfed237 100644
--- a/src/main/java/net/citizensnpcs/util/NMS.java
+++ b/src/main/java/net/citizensnpcs/util/NMS.java
@@ -12,7 +12,6 @@ import net.minecraft.server.DamageSource;
 import net.minecraft.server.Entity;
 import net.minecraft.server.EntityLiving;
 import net.minecraft.server.EntityMonster;
-import net.minecraft.server.EntityPlayer;
 import net.minecraft.server.EntityTypes;
 import net.minecraft.server.MobEffectList;
 import net.minecraft.server.Navigation;
@@ -50,7 +49,7 @@ public class NMS {
 
     public static void addOrRemoveFromPlayerList(LivingEntity bukkitEntity, boolean remove) {
         EntityLiving handle = ((CraftLivingEntity) bukkitEntity).getHandle();
-        if (handle.world == null || !(handle instanceof EntityPlayer))
+        if (handle.world == null)
             return;
         if (remove)
             handle.world.players.remove(handle);