diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb
index 4088f50dad..8bbd822f4e 100644
--- a/Library/Homebrew/formula.rb
+++ b/Library/Homebrew/formula.rb
@@ -260,11 +260,8 @@ class Formula
         # we allow formulae to do anything they want to the Ruby process
         # so load any deps before this point! And exit asap afterwards
         yield self
-      rescue RuntimeError, SystemCallError
-        %w(config.log CMakeCache.txt).each do |fn|
-          (HOMEBREW_LOGS/name).install(fn) if File.file?(fn)
-        end
-        raise
+      ensure
+        (HOMEBREW_LOGS+name).install Dir["config.log", "CMakeCache.txt"]
       end
     end
   end