diff --git a/src/commands/default/player.py b/src/commands/default/player.py
index 8dc667df67..aa7e303fe8 100644
--- a/src/commands/default/player.py
+++ b/src/commands/default/player.py
@@ -222,7 +222,7 @@ class CmdIC(MuxPlayerCommand):
                 return
         if not new_character:
             # search for a matching character
-            new_character = search.object_search(self.args, player)
+            new_character = search.object_search(self.args)
             if new_character:
                 new_character = new_character[0]
             else:
@@ -648,6 +648,6 @@ class CmdQuell(MuxPlayerCommand):
                 self.msg("Already quelling Player%s permissions." % permstr)
                 return
             player.set_attribute('_quell', True)
-            self.msg("Quelling Player%s permissions. Use @unquell to get them back." % permstr)
+            self.msg("Quelling Player permissions%s. Use @unquell to get them back." % permstr)
         self._recache_locks(player)
 
diff --git a/src/commands/default/tests.py b/src/commands/default/tests.py
index 250dd6a572..ccad26bf56 100644
--- a/src/commands/default/tests.py
+++ b/src/commands/default/tests.py
@@ -164,7 +164,7 @@ class TestPlayer(CommandTest):
         self.call(player.CmdSessions(), "", "Your current session(s):")
         self.call(player.CmdColorTest(), "ansi", "ANSI colors:")
         self.call(player.CmdCharCreate(), "Test1=Test char","Created new character Test1. Use @ic Test1 to enter the game")
-        self.call(player.CmdQuell(), "", "Quelling Player permissions (Immortals).")
+        self.call(player.CmdQuell(), "", "Quelling Player permissions (Immortals). Use @unquell to get them back.")
 
 from src.commands.default import building
 class TestBuilding(CommandTest):
diff --git a/src/objects/manager.py b/src/objects/manager.py
index 71d647c4c1..2372bf053d 100644
--- a/src/objects/manager.py
+++ b/src/objects/manager.py
@@ -167,7 +167,8 @@ class ObjectManager(TypedObjectManager):
         """
         if isinstance(property_value, basestring):
             property_value = to_unicode(property_value)
-        property_name = "db_%s" % property_name.lstrip('db_')
+        if isinstance(property_name, basestring):
+            property_name = "db_%s" % property_name.lstrip('db_')
         cand_restriction = candidates and Q(pk__in=[_GA(obj, "id") for obj in make_iter(candidates) if obj]) or Q()
         type_restriction = typeclasses and Q(db_typeclass_path__in=make_iter(typeclasses)) or Q()
         try: