diff --git a/src/commands/default/general.py b/src/commands/default/general.py
index fb201b3f3c..f48ab6bc78 100644
--- a/src/commands/default/general.py
+++ b/src/commands/default/general.py
@@ -268,10 +268,6 @@ class CmdGet(MuxCommand):
         if caller == obj:
             caller.msg("You can't get yourself.")
             return
-        if obj.player or obj.destination: 
-            # don't allow picking up player objects, nor exits.
-            caller.msg("You can't get that.")
-            return
         if obj.location == caller:
             caller.msg("You already hold that.")
             return
diff --git a/src/objects/objects.py b/src/objects/objects.py
index 84ea9edbc8..847b894367 100644
--- a/src/objects/objects.py
+++ b/src/objects/objects.py
@@ -433,10 +433,7 @@ class Room(Object):
         """
 
         super(Room, self).basetype_setup()
-        self.locks.add("puppet:false()") # would be weird to puppet a room ...
-        self.locks.add("get:false()")        
-
-        super(Room, self).basetype_setup()
+        self.locks.add("get:false();puppet:false()") # would be weird to puppet a room ...
         self.location = None