diff --git a/src/main/NGECore.java b/src/main/NGECore.java
index 44cab1a0..1da3308a 100644
--- a/src/main/NGECore.java
+++ b/src/main/NGECore.java
@@ -524,7 +524,9 @@ public class NGECore {
 		List<CreatureObject> deletedObjects = new ArrayList<CreatureObject>();
 		
 		while(cursor.hasNext()) {
-			SWGObject creature = (SWGObject) cursor.next();
+			Object next = cursor.next();
+			if (next == null) continue;
+			SWGObject creature = (SWGObject) next;
 			if(!characterService.playerExists(creature.getObjectID()) && creature instanceof CreatureObject)
 				deletedObjects.add((CreatureObject) creature);
 		}
diff --git a/src/services/SimulationService.java b/src/services/SimulationService.java
index 432868e4..170a30ba 100644
--- a/src/services/SimulationService.java
+++ b/src/services/SimulationService.java
@@ -193,7 +193,9 @@ public class SimulationService implements INetworkDispatch {
 		ODBCursor cursor = core.getSWGObjectODB().getCursor();
 		
 		while(cursor.hasNext()) {
-			SWGObject building = core.objectService.getObject(((SWGObject) cursor.next()).getObjectID());
+			Object next = cursor.next();
+			if (next == null) continue;
+			SWGObject building = core.objectService.getObject(((SWGObject) next).getObjectID());
 			if(building == null || (!(building instanceof BuildingObject) && !(building instanceof HarvesterObject)))
 				continue;
 			if(building.getAttachment("hasLoadedServerTemplate") == null)