diff --git a/commands.js b/commands.js
index eb29e3c..1d19a8e 100644
--- a/commands.js
+++ b/commands.js
@@ -60,6 +60,10 @@ function suggestFix(msg, projects){
     const shortcuts = msg.match(msgRegex);
     const expansion = {};
 
+    if(shortcuts === null){
+        return null;
+    }
+
     expansion.project = findShortcut(shortcuts[1], projects);
     if(expansion.project) {
         expansion.project = expansion.project.toLowerCase();
@@ -110,6 +114,10 @@ commands.expandCommand = (msg, projects) => {
         const shortcuts = msg.match(msgRegex);
         const expansion = {};
 
+        if(shortcuts === null){
+            reject('No regex match.');
+            return;
+        }
         expansion.project = findShortcut(shortcuts[1], projects);
         if(expansion.project) {
             expansion.project = expansion.project.toLowerCase();
diff --git a/index.js b/index.js
index 3d28ab3..3236200 100644
--- a/index.js
+++ b/index.js
@@ -50,13 +50,14 @@ matrixClient.on('Room.timeline', function(event, room, resetTimeline) {
         subcommand.exec(args, room, event);
     }, (fail) => { // command not found
         let tmp = commands.suggestFix(body, commands.projects);
-        let suggestions = "";
-        for(let i = 0; i < tmp.length; i++){
-            suggestions += "\n"+tmp[i];
+        if(tmp !== null){ //when the regex matches nothing
+            let suggestions = "";
+            for(let i = 0; i < tmp.length; i++){
+                suggestions += "\n"+tmp[i];
+            }
+            matrixClient.sendNotice(room.roomId, 'Unrecognized command.\n' +
+                'Did you mean:'+suggestions);
         }
-        matrixClient.sendNotice(room.roomId, 'Unrecognized command.\n' +
-            'Did you mean:'+suggestions);
-
     });
 });