2 files changed, 5 insertions, 3 deletions
diff --git a/Library/Homebrew/cask/lib/hbc/cli.rb b/Library/Homebrew/cask/lib/hbc/cli.rb
index 2b2211877..73ab121d2 100644
--- a/Library/Homebrew/cask/lib/hbc/cli.rb
+++ b/Library/Homebrew/cask/lib/hbc/cli.rb
@@ -152,7 +152,7 @@ module Hbc
       Hbc.default_tap.install unless Hbc.default_tap.installed?
       Hbc.init if should_init?(command)
       run_command(command, *rest)
-    rescue CaskError, CaskSha256MismatchError => e
+    rescue CaskError, CaskSha256MismatchError, ArgumentError => e
       msg = e.message
       msg << e.backtrace.join("\n") if Hbc.debug
       onoe msg
diff --git a/Library/Homebrew/cask/lib/hbc/cli/internal_stanza.rb b/Library/Homebrew/cask/lib/hbc/cli/internal_stanza.rb
index 105e946d7..c54db8795 100644
--- a/Library/Homebrew/cask/lib/hbc/cli/internal_stanza.rb
+++ b/Library/Homebrew/cask/lib/hbc/cli/internal_stanza.rb
@@ -44,13 +44,15 @@ module Hbc
         :stage_only,
         :nested_container,
         :uninstall,
-        :postflight,
-        :uninstall_postflight,
         :preflight,
+        :postflight,
+        :uninstall_preflight,
         :uninstall_postflight,
       ]
 
       def self.run(*args)
+        raise ArgumentError, "No stanza given." if args.empty?
+
         table = args.include? "--table"
         quiet = args.include? "--quiet"
         format = :to_yaml if args.include? "--yaml"