diff --git a/Library/Homebrew/brew.rb b/Library/Homebrew/brew.rb
index ca89004014..8d4b8799b8 100644
--- a/Library/Homebrew/brew.rb
+++ b/Library/Homebrew/brew.rb
@@ -59,7 +59,8 @@ begin
 
   ARGV.delete_at(help_cmd_index) if help_cmd_index
 
-  Homebrew.args = Homebrew::CLI::Parser.new.parse(ARGV.dup.freeze, ignore_invalid_options: true)
+  args = Homebrew::CLI::Parser.new.parse(ARGV.dup.freeze, ignore_invalid_options: true)
+  Homebrew.args = args
 
   path = PATH.new(ENV["PATH"])
   homebrew_path = PATH.new(ENV["HOMEBREW_PATH"])
@@ -148,7 +149,7 @@ rescue Interrupt
   exit 130
 rescue BuildError => e
   Utils::Analytics.report_build_error(e)
-  e.dump
+  e.dump(verbose: args.verbose?)
 
   if e.formula.head? || e.formula.deprecated? || e.formula.disabled?
     $stderr.puts <<~EOS
diff --git a/Library/Homebrew/exceptions.rb b/Library/Homebrew/exceptions.rb
index 49e05e0484..f3fb93c6f0 100644
--- a/Library/Homebrew/exceptions.rb
+++ b/Library/Homebrew/exceptions.rb
@@ -356,10 +356,10 @@ class BuildError < RuntimeError
     []
   end
 
-  def dump
+  def dump(verbose: false)
     puts
 
-    if Homebrew.args.verbose?
+    if verbose
       require "system_config"
       require "build_environment"
 
diff --git a/Library/Homebrew/upgrade.rb b/Library/Homebrew/upgrade.rb
index d447331884..99a954464e 100644
--- a/Library/Homebrew/upgrade.rb
+++ b/Library/Homebrew/upgrade.rb
@@ -102,7 +102,7 @@ module Homebrew
   rescue CannotInstallFormulaError => e
     ofail e
   rescue BuildError => e
-    e.dump
+    e.dump(verbose: args.verbose?)
     puts
     Homebrew.failed = true
   rescue DownloadError => e
@@ -225,7 +225,7 @@ module Homebrew
     rescue CannotInstallFormulaError => e
       ofail e
     rescue BuildError => e
-      e.dump
+      e.dump(verbose: args.verbose?)
       puts
       Homebrew.failed = true
     rescue DownloadError => e