diff --git a/src/services/SimulationService.java b/src/services/SimulationService.java
index 98f4a230..9b9a81ab 100644
--- a/src/services/SimulationService.java
+++ b/src/services/SimulationService.java
@@ -263,6 +263,10 @@ public class SimulationService implements INetworkDispatch {
 	}
 		
 	public boolean remove(SWGObject object, float x, float y, boolean notifyObservers) {
+		if (object == null || !object.isInQuadtree()) {
+			return false;
+		}
+		
 		boolean success = quadTrees.get(object.getPlanet().getName()).remove(x, y, object);
 		object.setIsInQuadtree(success);
 		if(success && notifyObservers) {