diff --git a/src/objects/models.py b/src/objects/models.py
index af5e430b7f..cf54e14fc4 100644
--- a/src/objects/models.py
+++ b/src/objects/models.py
@@ -281,7 +281,7 @@ class ObjectDB(TypedObject):
                 # dbref search
                 loc = ObjectDB.objects.dbref_search(location)
                 loc = loc and _GA(loc, "dbobj")
-            elif type(location) != ObjectDB:
+            elif location and type(location) != ObjectDB:
                 loc = _GA(location, "dbobj")
             else:
                 loc = location