diff --git a/Library/Homebrew/dev-cmd/test-bot.rb b/Library/Homebrew/dev-cmd/test-bot.rb
index 89397df449f28bd2289a38c27a8b1f4de90e8fc1..bf332ac256d01597a156105f67a6af222a4f82de 100644
--- a/Library/Homebrew/dev-cmd/test-bot.rb
+++ b/Library/Homebrew/dev-cmd/test-bot.rb
@@ -247,11 +247,13 @@ module Homebrew
 
     def safe_formula_canonical_name(formula_name)
       Formulary.factory(formula_name).full_name
-    rescue TapFormulaUnavailableError => e
+    rescue TapFormulaUnavailableError, FormulaUnavailableError => e
       raise if e.tap.installed?
       test "brew", "tap", e.tap.name
       retry unless steps.last.failed?
-    rescue FormulaUnavailableError, TapFormulaAmbiguityError, TapFormulaWithOldnameAmbiguityError => e
+      onoe e
+      puts e.backtrace
+    rescue TapFormulaAmbiguityError, TapFormulaWithOldnameAmbiguityError => e
       onoe e
       puts e.backtrace
     end