diff --git a/src/resources/objects/SWGObject.java b/src/resources/objects/SWGObject.java
index 919831af7..b69914739 100644
--- a/src/resources/objects/SWGObject.java
+++ b/src/resources/objects/SWGObject.java
@@ -576,6 +576,9 @@ public abstract class SWGObject implements Serializable, Comparable<SWGObject> {
 	}
 
 	private void sendUpdatedContainment(List<SWGObject> oldObservers, List<SWGObject> newObservers) {
+		if (parent == null)
+			return;
+
 		List<SWGObject> same = new ArrayList<>(oldObservers);
 		same.retainAll(newObservers);
 
@@ -586,7 +589,9 @@ public abstract class SWGObject implements Serializable, Comparable<SWGObject> {
 		removed.removeAll(newObservers);
 
 		for (SWGObject swgObject : same) {
-			swgObject.sendSelf(new UpdateContainmentMessage(objectId, parent.getObjectId(), slotArrangement));
+			if (swgObject.getOwner() != null) {
+				swgObject.sendSelf(new UpdateContainmentMessage(objectId, parent.getObjectId(), slotArrangement));
+			}
 		}
 
 		for (SWGObject swgObject : added) {