diff --git a/evennia/server/inputfuncs.py b/evennia/server/inputfuncs.py
index 5bc19f36ff..3785131ac8 100644
--- a/evennia/server/inputfuncs.py
+++ b/evennia/server/inputfuncs.py
@@ -191,7 +191,8 @@ def get_inputfuncs(session, *args, **kwargs):
     it from this module alone since multiple modules could be added.
     So we get it from the sessionhandler.
     """
-    inputfuncsdict = dict((key, func.__doc__) for key, func in session.sessionhandler.get_inputfuncs().iterkeys())
+    inputfuncsdict = dict((key, func.__doc__) for key, func
+                          in session.sessionhandler.get_inputfuncs().iteritems())
     session.msg(get_inputfuncs=inputfuncsdict)
 
 
diff --git a/evennia/server/portal/telnet_oob.py b/evennia/server/portal/telnet_oob.py
index c27da92a60..a95dc4bd5c 100644
--- a/evennia/server/portal/telnet_oob.py
+++ b/evennia/server/portal/telnet_oob.py
@@ -363,8 +363,7 @@ class TelnetOOB(object):
             try:
                 cmdname, structure = data.split(None, 1)
             except ValueError:
-                self.protocol.data_in(**{data: [[],{}]})
-                return
+                cmdname, structure = data, ""
             cmdname = cmdname.replace(".", "_")
             try:
                 structure = json.loads(structure)