diff --git a/Library/Homebrew/tap.rb b/Library/Homebrew/tap.rb
index 0d9cacdb62..dc7104dc58 100644
--- a/Library/Homebrew/tap.rb
+++ b/Library/Homebrew/tap.rb
@@ -241,6 +241,8 @@ class Tap
 
     if official? && DEPRECATED_OFFICIAL_TAPS.include?(repo)
       odie "#{name} was deprecated. This tap is now empty as all its formulae were migrated."
+    elsif user == "caskroom"
+      odie "#{name} was moved. Tap homebrew/cask-#{repo} instead."
     end
 
     if installed? && force_auto_update.nil?