diff --git a/Library/Homebrew/cmd/tap.rb b/Library/Homebrew/cmd/tap.rb
index c0cb6e8f1b..701931f1e4 100644
--- a/Library/Homebrew/cmd/tap.rb
+++ b/Library/Homebrew/cmd/tap.rb
@@ -14,9 +14,11 @@ module Homebrew
     else
       user, repo = tap_args
       tap = Tap.fetch(user, repo)
-      unless tap.installed?
+      begin
         tap.install(:clone_target => ARGV.named[1],
                     :full_clone   => ARGV.include?("--full"))
+      rescue TapAlreadyTappedError => e
+        opoo e
       end
     end
   end