diff --git a/contrib/lineeditor.py b/contrib/lineeditor.py
index 145fc55ff6..a042a8a8b0 100644
--- a/contrib/lineeditor.py
+++ b/contrib/lineeditor.py
@@ -675,4 +675,4 @@ class CmdEditor(Command):
                                  loadfunc=load_attr,
                                  savefunc=save_attr,
                                  quitfunc=quit_hook,
-                                 key=editor_key)
\ No newline at end of file
+                                 key=editor_key)
diff --git a/src/objects/objects.py b/src/objects/objects.py
index 55a7c05fb3..7b48ec9c21 100644
--- a/src/objects/objects.py
+++ b/src/objects/objects.py
@@ -729,7 +729,7 @@ class Object(TypeClass):
         Called after move has completed, regardless of quiet mode or not.
         Allows changes to the object due to the location it is now in.
 
-        source_location - where we came from
+        source_location - where we came from. This may be None.
         """
         pass
 
diff --git a/src/utils/create.py b/src/utils/create.py
index b1e4e9e27c..7414697a4e 100644
--- a/src/utils/create.py
+++ b/src/utils/create.py
@@ -195,8 +195,8 @@ def create_object(typeclass=None, key=None, location=None,
 
     # trigger relevant move_to hooks in order to display messages.
     if location:
-        new_object.at_object_receive(new_object, None)
-        new_object.at_after_move(new_object)
+        location.at_object_receive(new_object, None)
+        new_object.at_after_move(None)
 
     # post-hook setup (mainly used by Exits)
     new_object.basetype_posthook_setup()