diff --git a/Library/Contributions/examples/brew-bottle.rb b/Library/Contributions/examples/brew-bottle.rb
index 4d6083f277..05ee56d4c7 100755
--- a/Library/Contributions/examples/brew-bottle.rb
+++ b/Library/Contributions/examples/brew-bottle.rb
@@ -1,18 +1,20 @@
 # Builds binary brew package
 require 'cmd/install'
 
-Homebrew.install_formulae ARGV.formulae
-
 destination = HOMEBREW_PREFIX + "Bottles"
-if not File.directory?(destination)
-  Dir.mkdir destination
-end
+Dir.mkdir destination unless File.directory? destination
 
 ARGV.each do|formula|
   # Get the latest version
   version = `brew list --versions #{formula}`.split.last
+
+  if version.nil?
+    onoe "Formula not installed: #{formula}"
+    next
+  end
+
   source = HOMEBREW_CELLAR + formula + version
-  filename = formula + '-' + version + '-bottle.tar.gz'
+  filename = "#{formula}-#{version}-bottle.tar.gz"
   ohai "Bottling #{formula} #{version}..."
   HOMEBREW_CELLAR.cd do
     # Use gzip, faster to compress than bzip2, faster to uncompress than bzip2