Refactor code for readability and compatibility.

evennia/commands/cmdhandler.py

@@ -383,7 +383,7 @@ def get_and_merge_cmdsets(caller, session, player, obj, callertype):
     except Exception:
         _msg_err(caller, _ERROR_CMDSETS)
         raise
-        raise ErrorReported
+        #raise ErrorReported
 
 # Main command-handler function
 
@@ -565,7 +565,7 @@ def cmdhandler(called_by, raw_string, _testing=False, callertype="session", sess
                     syscmd.matches = matches
                 else:
                     # fall back to default error handling
-                    sysarg = yield _SEARCH_AT_RESULT([match[2] for match in matches], caller, query=match[0])
+                    sysarg = yield _SEARCH_AT_RESULT([match[2] for match in matches], caller, query=matches[0][0])
                 raise ExecSystemCommand(syscmd, sysarg)
 
             if len(matches) == 1: