diff --git a/Library/Homebrew/cmd/--cache.rb b/Library/Homebrew/cmd/--cache.rb
index 63a61485db..2f4a06cea5 100644
--- a/Library/Homebrew/cmd/--cache.rb
+++ b/Library/Homebrew/cmd/--cache.rb
@@ -38,14 +38,16 @@ module Homebrew
         else
           puts formula.cached_download
         end
-      rescue FormulaUnavailableError => fe
+      rescue FormulaUnavailableError => e
+        formula_error_message = e.message
         begin
           cask = Cask::CaskLoader.load name
           puts "cask: #{Cask::Cmd::Cache.cached_location(cask)}"
-        rescue Cask::CaskUnavailableError => ce
+        rescue Cask::CaskUnavailableError => e
+          cask_error_message = e.message
           odie "No available formula or cask with the name \"#{name}\"\n" \
-               "#{fe.message}\n" \
-               "#{ce.message}\n"
+               "#{formula_error_message}\n" \
+               "#{cask_error_message}\n"
         end
       end
     end
diff --git a/Library/Homebrew/cmd/home.rb b/Library/Homebrew/cmd/home.rb
index 575c98c2b0..2b1171cbb4 100644
--- a/Library/Homebrew/cmd/home.rb
+++ b/Library/Homebrew/cmd/home.rb
@@ -27,15 +27,17 @@ module Homebrew
     else
       homepages = args.named.map do |ref|
         Formulary.factory(ref).homepage
-      rescue FormulaUnavailableError => fe
+      rescue FormulaUnavailableError => e
+        formula_error_message = e.message
         begin
           cask = Cask::CaskLoader.load(ref)
           puts "Formula \"#{ref}\" not found. Found a cask instead."
           cask.homepage
-        rescue Cask::CaskUnavailableError => ce
+        rescue Cask::CaskUnavailableError => e
+          cask_error_message = e.message
           odie "No available formula or cask with the name \"#{name}\"\n" \
-               "#{fe.message}\n" \
-               "#{ce.message}\n"
+               "#{formula_error_message}\n" \
+               "#{cask_error_message}\n"
         end
       end
       exec_browser(*homepages)
diff --git a/Library/Homebrew/test/cmd/home_spec.rb b/Library/Homebrew/test/cmd/home_spec.rb
index 2cf41a4b60..17d22ffe94 100644
--- a/Library/Homebrew/test/cmd/home_spec.rb
+++ b/Library/Homebrew/test/cmd/home_spec.rb
@@ -31,8 +31,7 @@ describe "brew home", :integration_test do
 
   it "opens the homepage for a given Cask" do
     expect { brew "home", cask_path("local-caffeine"), "HOMEBREW_BROWSER" => "echo" }
-      .to output(/Formula "#{local_caffeine_path}" not found. Found a cask instead.\n#{local_caffeine_homepage}/m)
-            .to_stdout
+      .to output(/#{local_caffeine_homepage}/).to_stdout
       .and not_to_output.to_stderr
       .and be_a_success
   end
@@ -41,8 +40,7 @@ describe "brew home", :integration_test do
     setup_test_formula "testballhome"
 
     expect { brew "home", "testballhome", cask_path("local-caffeine"), "HOMEBREW_BROWSER" => "echo" }
-      .to output(/Formula "#{local_caffeine_path}" not found. Found a cask instead.\n#{testballhome_homepage} #{local_caffeine_homepage}/m)
-      .to_stdout
+      .to output(/#{testballhome_homepage} #{local_caffeine_homepage}/).to_stdout
       .and not_to_output.to_stderr
       .and be_a_success
   end