diff --git a/Library/Homebrew/cleanup.rb b/Library/Homebrew/cleanup.rb
index a8f8cb5765..a0decc01b0 100644
--- a/Library/Homebrew/cleanup.rb
+++ b/Library/Homebrew/cleanup.rb
@@ -97,7 +97,7 @@ module CleanupRefinement
 
       cask = begin
         Cask::CaskLoader.load(name)
-      rescue Cask::CaskUnavailableError
+      rescue Cask::CaskError
         return false
       end
 
@@ -196,7 +196,7 @@ module Homebrew
 
           cask = begin
             Cask::CaskLoader.load(arg)
-          rescue Cask::CaskUnavailableError
+          rescue Cask::CaskError
             nil
           end