diff --git a/src/services/StaticService.java b/src/services/StaticService.java
index 11b9dee8..fb52a566 100644
--- a/src/services/StaticService.java
+++ b/src/services/StaticService.java
@@ -121,6 +121,7 @@ public class StaticService implements INetworkDispatch {
 		long objectId = core.objectService.getDOId(planetName, template, 0, buildingId, cellNumber, x, y, z);
 		
 		SWGObject object = null;
+		
 		MobileTemplate mobileTemplate = core.spawnService.getMobileTemplate(template);
 		
 		if (mobileTemplate != null) {
@@ -149,6 +150,10 @@ public class StaticService implements INetworkDispatch {
 			System.err.println("StaticService: ObjectId " + objectId + " was taken for object with template " + object.getTemplate() + ".  Replacement: " + object.getObjectID());
 		}
 		
+		if (mobileTemplate != null) {
+			return object;
+		}
+		
 		boolean checkCells = false; // shouldn't be needed; for debugging
 		
 		if (object instanceof BuildingObject && checkCells) {