diff --git a/Plugin NPC/src/main/java/net/simon987/npcplugin/Factory.java b/Plugin NPC/src/main/java/net/simon987/npcplugin/Factory.java
index d77a572..91f4310 100644
--- a/Plugin NPC/src/main/java/net/simon987/npcplugin/Factory.java	
+++ b/Plugin NPC/src/main/java/net/simon987/npcplugin/Factory.java	
@@ -54,9 +54,12 @@ public class Factory extends GameObject implements Updatable {
             for (Object id : tmpNpcArray) {
 
                 NonPlayerCharacter npc = (NonPlayerCharacter) GameServer.INSTANCE.getGameUniverse().getObject((int) (long) id);
-                npc.setFactory(this);
 
-                npcs.add(npc);
+                if (npc != null) {
+                    npc.setFactory(this);
+                    npcs.add(npc);
+                }
+
             }
 
         } else {