diff --git a/Library/Homebrew/cmd/audit.rb b/Library/Homebrew/cmd/audit.rb
index 46197298b1..e0d2a8d009 100644
--- a/Library/Homebrew/cmd/audit.rb
+++ b/Library/Homebrew/cmd/audit.rb
@@ -281,6 +281,9 @@ class FormulaAuditor
         if version_url.to_s == version_text.to_s && s.version.instance_of?(Version)
           problem "#{spec} version #{version_text} is redundant with version scanned from URL"
         end
+        if bottle_filename_formula_name(bottle_filename(f)).empty?
+          problem "Add a new version regex to version.rb to parse the bottle filename."
+        end
       end
 
       if s.version.to_s =~ /^v/
diff --git a/Library/Homebrew/cmd/bottle.rb b/Library/Homebrew/cmd/bottle.rb
index 611a4b57ec..569bc03eda 100644
--- a/Library/Homebrew/cmd/bottle.rb
+++ b/Library/Homebrew/cmd/bottle.rb
@@ -51,6 +51,11 @@ module Homebrew extend self
 
     bottle_revision = bottle_new_revision f
     filename = bottle_filename f, bottle_revision
+
+    if bottle_filename_formula_name(filename).empty?
+      return ofail "Add a new version regex to version.rb to parse the bottle filename."
+    end
+
     bottle_path = Pathname.pwd/filename
     sha1 = nil