diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb
index f2638bc02d..96ea65ba01 100644
--- a/Library/Homebrew/formula.rb
+++ b/Library/Homebrew/formula.rb
@@ -403,7 +403,7 @@ class Formula
 
     return klass.new(name) if install_type == :from_name
     return klass.new(name, target_file)
-  rescue LoadError
+  rescue LoadError, NameError
     raise FormulaUnavailableError.new(name)
   end