diff --git a/Library/Homebrew/brew.h.rb b/Library/Homebrew/brew.h.rb
index 9e25bfb939..4c733b7c51 100644
--- a/Library/Homebrew/brew.h.rb
+++ b/Library/Homebrew/brew.h.rb
@@ -478,9 +478,7 @@ end
 class Cleaner
   def initialize f
     @f=f
-
-    [f.bin, f.sbin, f.lib].each {|d| clean_dir d}
-
+    [f.bin, f.sbin, f.lib].select{|d|d.exist?}.each{|d|clean_dir d}
     # info pages suck
     info = f.share+'info'
     info.rmtree if info.directory? and not f.skip_clean? info