diff --git a/examples/catchall.php b/examples/catchall.php
new file mode 100644
index 0000000..7c503af
--- /dev/null
+++ b/examples/catchall.php
@@ -0,0 +1,20 @@
+<?php
+
+require_once __DIR__."/../vendor/autoload.php";
+
+use NoccyLabs\Shell\Shell;
+use NoccyLabs\Shell\Context;
+
+class CatchAllContext extends Context
+{
+    public function execute($cmd, ...$arg)
+    {
+        printf("Executing: %s %s\n", $cmd, join(" ",$arg));
+        return true;
+    }
+}
+
+$myShell = new Shell();
+$myShell->setPrompt("test>");
+$myShell->pushContext(new CatchAllContext());
+$myShell->run();
diff --git a/lib/Context.php b/lib/Context.php
index 0b1da8b..c8f36e9 100644
--- a/lib/Context.php
+++ b/lib/Context.php
@@ -146,6 +146,23 @@ class Context
         return array_key_exists('global', $info);
     }
 
+    /**
+     * Catch-all handler for commands not defined in context, globally or builtin.
+     * Override this function and return true if the command is handled ok.
+     *
+     * @param string $command The command to execute
+     * @param string[] $args The arguments to the command
+     * @return bool True if the command was handled
+     */
+    public function execute($command, ...$args)
+    {
+        return false;
+    }
+
+    /**
+     * Get the name of the context
+     *
+     */
     public function getName()
     {
         return $this->name;
diff --git a/lib/Shell.php b/lib/Shell.php
index da24fbb..8f067ad 100644
--- a/lib/Shell.php
+++ b/lib/Shell.php
@@ -223,6 +223,12 @@ class Shell
             }
             return;
         }
+
+        // Call 'execute' on the current context
+        if ($this->context->execute($command, ...$args)) {
+            return;
+        }
+
         // Throw error if the command could not be found
         throw new Exception\BadCommandException("Command {$command} not found");
     }