diff --git a/lib/stack_master/cli.rb b/lib/stack_master/cli.rb
index 0a95ced9..4cbad343 100644
--- a/lib/stack_master/cli.rb
+++ b/lib/stack_master/cli.rb
@@ -193,7 +193,7 @@ def execute!
           stack_name = Utils.underscore_to_hyphen(args[1])
 
           StackMaster.cloud_formation_driver.set_region(region)
-          StackMaster::Commands::Delete.perform(region, stack_name)
+          StackMaster::Commands::Delete.perform(region, stack_name).success?
         end
       end
 
diff --git a/lib/stack_master/commands/apply.rb b/lib/stack_master/commands/apply.rb
index 932eee62..33f77e77 100644
--- a/lib/stack_master/commands/apply.rb
+++ b/lib/stack_master/commands/apply.rb
@@ -212,7 +212,7 @@ def ensure_valid_parameters!
           @stack_definition.parameter_files.each do |parameter_file|
             StackMaster.stderr.puts " - #{parameter_file}"
           end
-          halt!
+          failed!
         end
       end
 
diff --git a/lib/stack_master/commands/delete.rb b/lib/stack_master/commands/delete.rb
index 415db334..7ae1b06b 100644
--- a/lib/stack_master/commands/delete.rb
+++ b/lib/stack_master/commands/delete.rb
@@ -12,7 +12,7 @@ def initialize(region, stack_name)
 
       def perform
 
-        return unless check_exists
+        failed! unless check_exists
 
         unless ask?("Really delete stack #{@stack_name} (y/n)? ")
           StackMaster.stdout.puts "Stack update aborted"