diff --git a/mozilla/extensions/irc/xul/content/commands.js b/mozilla/extensions/irc/xul/content/commands.js
index 479c0a4acef..1f0b2e26fac 100644
--- a/mozilla/extensions/irc/xul/content/commands.js
+++ b/mozilla/extensions/irc/xul/content/commands.js
@@ -354,6 +354,12 @@ function dispatch(text, e, isInteractive, flags)
 
     /* split command from arguments */
     var ary = text.match(/(\S+) ?(.*)/);
+    if (!ary)
+    {
+        display(getMsg(MSG_ERR_NO_COMMAND, ""));
+        return null;
+    }
+
     e.commandText = ary[1];
     if (ary[2])
         e.inputData = stringTrim(ary[2]);