diff --git a/console.c b/console.c
index c026db2..40e8698 100644
--- a/console.c
+++ b/console.c
@@ -134,6 +134,12 @@ _execute_shell_command(mfshell_t *mfshell,char *command)
     // FIXME: handle non-zero return value of wordexp
     retval = wordexp(command, &p, WRDE_SHOWERR | WRDE_UNDEF);
 
+    if (p.we_wordc < 1)
+        return 0;
+
+    if (p.we_wordv[0] == NULL)
+        return 0;
+
     // TODO: handle retval
     retval = _execute(mfshell, p.we_wordc, p.we_wordv);
 
diff --git a/main.c b/main.c
index 08814a4..d04fe58 100644
--- a/main.c
+++ b/main.c
@@ -200,7 +200,9 @@ mfshell_run(mfshell_t *mfshell)
         if (retval == -1) {
             exit(1);
         }
-        string_chomp(cmd);
+
+        if (cmd[strlen(cmd)-1] == '\n')
+            cmd[strlen(cmd)-1] = '\0';
 
         printf("\n\r");