diff --git a/library/Icinga/Application/Cli.php b/library/Icinga/Application/Cli.php
index 2ea47e590..eeba18ec1 100644
--- a/library/Icinga/Application/Cli.php
+++ b/library/Icinga/Application/Cli.php
@@ -151,8 +151,8 @@ class Cli extends ApplicationBootstrap
         if ($this->showBenchmark) {
             Benchmark::dump();
         }
-        if (false === $result) {
-            exit(1);
+        if ($result === false) {
+            exit(3);
         }
     }
 
diff --git a/library/Icinga/Cli/Command.php b/library/Icinga/Cli/Command.php
index 117dbf66d..d2f5d29e7 100644
--- a/library/Icinga/Cli/Command.php
+++ b/library/Icinga/Cli/Command.php
@@ -197,6 +197,7 @@ abstract class Command
             $this->commandName,
             $action
         );
+        return false;
     }
 
     public function init()