diff --git a/shell/main.cpp b/shell/main.cpp
index 249f1b6..07821f7 100644
--- a/shell/main.cpp
+++ b/shell/main.cpp
@@ -424,7 +424,15 @@ int main(int argc, char **argv)
         }
 
         /* Exhaust command input (if not all used by the command) */
-        parser.exhaust_until_separator();
+        while(true) {
+            try {
+                parser.exhaust_until_separator();
+                break;
+            }
+            catch(std::exception &e) {
+                FxOS_log(ERR, "%s", e.what());
+            }
+        }
     }
 
     /* Save command history */