diff --git a/ContentDirectory.py b/ContentDirectory.py
index 93b96b1..9ae5734 100644
--- a/ContentDirectory.py
+++ b/ContentDirectory.py
@@ -207,10 +207,14 @@ class ContentDirectoryControl(UPnPPublisher, dict):
 		didl = DIDLElement()
 		result = {}
 
+		# return error code if we don't exist anymore
+		if ObjectID not in self:
+			raise errorCode(701)
+
 		# check to see if object needs to be updated
 		self[ObjectID].checkUpdate()
 
-		# return error code if we don't exist anymore
+		# make sure we still exist, we could of deleted ourself
 		if ObjectID not in self:
 			raise errorCode(701)