diff --git a/middleman-core/lib/middleman-core/cli/build.rb b/middleman-core/lib/middleman-core/cli/build.rb
index ae540ec8..e4ab33b8 100644
--- a/middleman-core/lib/middleman-core/cli/build.rb
+++ b/middleman-core/lib/middleman-core/cli/build.rb
@@ -53,7 +53,10 @@ module Middleman::Cli
     
     # Static methods
     class << self
-      
+      def exit_on_failure?
+        true
+      end
+
       # Middleman::Base singleton
       #
       # @return [Middleman::Base]
diff --git a/middleman-core/lib/middleman-core/cli/init.rb b/middleman-core/lib/middleman-core/cli/init.rb
index 7fe19a3b..6da690e5 100644
--- a/middleman-core/lib/middleman-core/cli/init.rb
+++ b/middleman-core/lib/middleman-core/cli/init.rb
@@ -42,6 +42,10 @@ module Middleman::Cli
       thor_group.new([name], options).invoke_all
     end
   end
+
+  def self.exit_on_failure?
+    true
+  end
   
   # Map "i", "new" and "n" to "init"
   Base.map({
@@ -49,4 +53,4 @@ module Middleman::Cli
     "new" => "init",
     "n"   => "init"
   })
-end
\ No newline at end of file
+end
diff --git a/middleman-core/lib/middleman-core/cli/server.rb b/middleman-core/lib/middleman-core/cli/server.rb
index f370deab..49c87c64 100644
--- a/middleman-core/lib/middleman-core/cli/server.rb
+++ b/middleman-core/lib/middleman-core/cli/server.rb
@@ -51,7 +51,11 @@ module Middleman::Cli
       Middleman::Watcher.start(params)
     end
   end
+
+  def self.exit_on_failure?
+    true
+  end  
   
   # Map "s" to "server"
   Base.map({ "s" => "server" })
-end
\ No newline at end of file
+end