diff --git a/src/services/object/ObjectService.java b/src/services/object/ObjectService.java
index 3fbdaf8d..ba076fc0 100644
--- a/src/services/object/ObjectService.java
+++ b/src/services/object/ObjectService.java
@@ -177,7 +177,7 @@ public class ObjectService implements INetworkDispatch {
 		
 		while (cursor.hasNext()) {
 			SWGObject object = (SWGObject) cursor.next();
-			if (!(object instanceof BuildingObject))
+			if (object != null && !(object instanceof BuildingObject))
 				objectList.put(object.getObjectID(), object);
 		}