From f677902811cb2b1e4b178651edcb1bc62da79b81 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sat, 22 Sep 2012 13:37:22 +0200
Subject: [PATCH] Fixed a bug with setting a location to None.

---
 src/objects/models.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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