From d2f81b7dc439b77b0ee8a06f79b7d8f7c33f64f3 Mon Sep 17 00:00:00 2001
From: Matt Parnell <parwok@gmail.com>
Date: Sun, 5 Oct 2014 01:02:02 -0500
Subject: [PATCH] proper return val on null

---
 src/services/object/ObjectService.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/services/object/ObjectService.java b/src/services/object/ObjectService.java
index d6e39144..18e83a17 100644
--- a/src/services/object/ObjectService.java
+++ b/src/services/object/ObjectService.java
@@ -576,7 +576,8 @@ public class ObjectService implements INetworkDispatch {
 				System.err.println("getObject(): object is null but objectList contains objectID key");
 			} else {
 				System.err.println("getObject(): object of id "+ objectID + "is null. Destroying object.");
-				destroyObject(object,0);				
+				destroyObject(object,0);
+				return null;
 			}
 		}