diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb
index ad385131e..a56ebfc1f 100644
--- a/Library/Homebrew/formula.rb
+++ b/Library/Homebrew/formula.rb
@@ -1461,12 +1461,14 @@ class Formula
   # @private
   def self.each
     files.each do |file|
-      yield Formulary.factory(file)
-    rescue => e
-      # Don't let one broken formula break commands. But do complain.
-      onoe "Failed to import: #{file}"
-      puts e
-      next
+      yield begin
+        Formulary.factory(file)
+      rescue FormulaUnavailableError => e
+        # Don't let one broken formula break commands. But do complain.
+        onoe "Failed to import: #{file}"
+        puts e
+        next
+      end
     end
   end