From 6e8951c7333d22c9f75f6822cf8a9dc289192840 Mon Sep 17 00:00:00 2001
From: fullwall <fullwall@users.noreply.github.com>
Date: Thu, 4 Jun 2015 12:00:16 +0800
Subject: [PATCH] Update HumanController.java

---
 src/main/java/net/citizensnpcs/npc/entity/HumanController.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/net/citizensnpcs/npc/entity/HumanController.java b/src/main/java/net/citizensnpcs/npc/entity/HumanController.java
index b72cb789d..046fe92bf 100644
--- a/src/main/java/net/citizensnpcs/npc/entity/HumanController.java
+++ b/src/main/java/net/citizensnpcs/npc/entity/HumanController.java
@@ -110,7 +110,7 @@ public class HumanController extends AbstractEntityController {
         Bukkit.getScheduler().scheduleSyncDelayedTask(CitizensAPI.getPlugin(), new Runnable() {
             @Override
             public void run() {
-                if (!getBukkitEntity().isValid())
+                if (getBukkitEntity() == null || !getBukkitEntity().isValid())
                     return;
                 boolean removeFromPlayerList = Setting.REMOVE_PLAYERS_FROM_PLAYER_LIST.asBoolean();
                 NMS.addOrRemoveFromPlayerList(getBukkitEntity(),