diff --git a/Library/Homebrew/cmd/tap.rb b/Library/Homebrew/cmd/tap.rb
index bfbc4a410d..dcf3089523 100644
--- a/Library/Homebrew/cmd/tap.rb
+++ b/Library/Homebrew/cmd/tap.rb
@@ -2,9 +2,10 @@ module Homebrew extend self
 
   def tap
     if ARGV.empty?
-      (HOMEBREW_LIBRARY/"Taps").children.each do |tap|
+      tapd = HOMEBREW_LIBRARY/"Taps"
+      tapd.children.each do |tap|
         puts tap.basename.sub('-', '/') if (tap/'.git').directory?
-      end
+      end if tapd.directory?
     else
       install_tap(*tap_args)
     end