diff --git a/library/Icinga/Application/Cli.php b/library/Icinga/Application/Cli.php
index dff20e679..eeba18ec1 100644
--- a/library/Icinga/Application/Cli.php
+++ b/library/Icinga/Application/Cli.php
@@ -146,11 +146,14 @@ class Cli extends ApplicationBootstrap
     {
         $loader = $this->cliLoader();
         $loader->parseParams();
-        $loader->dispatch();
+        $result = $loader->dispatch();
         Benchmark::measure('All done');
         if ($this->showBenchmark) {
             Benchmark::dump();
         }
+        if ($result === false) {
+            exit(3);
+        }
     }
 
     protected function dispatchEndless()
diff --git a/library/Icinga/Cli/Command.php b/library/Icinga/Cli/Command.php
index 486380b18..04ea8d69d 100644
--- a/library/Icinga/Cli/Command.php
+++ b/library/Icinga/Cli/Command.php
@@ -198,6 +198,7 @@ abstract class Command
             $this->commandName,
             $action
         );
+        return false;
     }
 
     public function init()