diff --git a/src/cmdhandler.py b/src/cmdhandler.py
index 5369850762..ba8d19f608 100755
--- a/src/cmdhandler.py
+++ b/src/cmdhandler.py
@@ -285,9 +285,9 @@ def handle(command):
                     (session, format_exc()))
                 # Prevent things from falling through to UnknownCommand.
                 raise ExitCommandHandler
-
-        # If we reach this point, we haven't matched anything.     
-        raise UnknownCommand
+        else:
+            # If we reach this point, we haven't matched anything.     
+            raise UnknownCommand
 
     except ExitCommandHandler:
         # When this is thrown, just get out and do nothing. It doesn't mean