From a7d5e0d2fdee950db76ffa50efb652dd5164d712 Mon Sep 17 00:00:00 2001
From: Matt Parnell <parwok@gmail.com>
Date: Sun, 5 Oct 2014 01:59:48 -0500
Subject: [PATCH] is the object null?

---
 src/services/object/ObjectService.java | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/services/object/ObjectService.java b/src/services/object/ObjectService.java
index a85bd4cb..89fcc439 100644
--- a/src/services/object/ObjectService.java
+++ b/src/services/object/ObjectService.java
@@ -1223,14 +1223,18 @@ public class ObjectService implements INetworkDispatch {
 				});
 				
 				creature.viewChildren(creature, true, true, (object) -> {
-					if(object.getMutex() == null)
-						object.initializeBaselines();
-						object.initAfterDBLoad();
-					if(object.getParentId() != 0 && object.getContainer() == null)
-						object.setParent(getObject(object.getParentId()));
-					object.getContainerInfo(object.getTemplate());
-					if(getObject(object.getObjectID()) != null)
-						objectList.put(object.getObjectID(), object);					
+					if (object != null) {
+						if(object.getMutex() == null)
+							object.initializeBaselines();
+							object.initAfterDBLoad();
+						if(object.getParentId() != 0 && object.getContainer() == null)
+							object.setParent(getObject(object.getParentId()));
+						object.getContainerInfo(object.getTemplate());
+						if(getObject(object.getObjectID()) != null)
+							objectList.put(object.getObjectID(), object);
+					} else {
+						Thread.currentThread().dumpStack();
+					}
 				});
 
 				if(creature.getParentId() != 0) {