diff --git a/src/cmdhandler.py b/src/cmdhandler.py
index ba8d19f608..24b47f7727 100755
--- a/src/cmdhandler.py
+++ b/src/cmdhandler.py
@@ -212,6 +212,7 @@ def match_channel(command):
         second_arg = "%s=%s" % (cname, command.command_argument)
         command.command_string = "@cemit"
         command.command_switches = ["sendername", "quiet"]
+        command.command_argument = second_arg
         
 def command_table_lookup(command, command_table, eval_perms=True):
     """
@@ -251,7 +252,9 @@ def handle(command):
             # Match against the 'idle' command.
             match_idle(command)
             # See if this is an aliased command.
+            print "CMD", command.command_string, command.command_argument
             match_alias(command)
+            print "CMD", command.command_string, command.command_argument
             # Check if the user is using a channel command.
             match_channel(command)
             # See if the user is trying to traverse an exit.
diff --git a/src/commands/comsys.py b/src/commands/comsys.py
index da6dbe5654..36a5a1f8b9 100644
--- a/src/commands/comsys.py
+++ b/src/commands/comsys.py
@@ -197,12 +197,14 @@ def cmd_cemit(command):
         return
 
     eq_args = command.command_argument.split('=', 1)
-    cname = eq_args[0]
-    cmessage = eq_args[1]
     
     if len(eq_args) != 2:
         session.msg("You must provide a channel name and a message to emit.")
         return
+    
+    cname = eq_args[0]
+    cmessage = eq_args[1]
+    
     if len(cname) == 0:
         session.msg("You must provide a channel name to emit to.")
         return