diff --git a/Library/Homebrew/cleaner.rb b/Library/Homebrew/cleaner.rb
index 865810e1bd..6d74ebe82f 100644
--- a/Library/Homebrew/cleaner.rb
+++ b/Library/Homebrew/cleaner.rb
@@ -32,8 +32,10 @@ class Cleaner
     Dir.glob(@f.info/"**/dir").each do |f|
       info_dir_file = Pathname(f)
       next if info_dir_file == Pathname("#{@f.info}/#{@f.name}/dir")
+      next if @f.skip_clean?(info_dir_file)
+      next unless info_dir_file.file?
 
-      observe_file_removal info_dir_file if info_dir_file.file? && !@f.skip_clean?(info_dir_file)
+      observe_file_removal info_dir_file
     end
 
     rewrite_shebangs