diff --git a/Library/Homebrew/cask/audit.rb b/Library/Homebrew/cask/audit.rb
index 9ff80580e0..da142f6820 100644
--- a/Library/Homebrew/cask/audit.rb
+++ b/Library/Homebrew/cask/audit.rb
@@ -82,7 +82,7 @@ module Cask
       check_bitbucket_repository
       self
     rescue => e
-      odebug "#{e.message}\n#{e.backtrace.join("\n")}"
+      odebug e, e.backtrace
       add_error "exception while auditing #{cask}: #{e.message}"
       self
     end
diff --git a/Library/Homebrew/formula_versions.rb b/Library/Homebrew/formula_versions.rb
index c33726de0e..5bb2fb4494 100644
--- a/Library/Homebrew/formula_versions.rb
+++ b/Library/Homebrew/formula_versions.rb
@@ -50,7 +50,7 @@ class FormulaVersions
   rescue *IGNORED_EXCEPTIONS => e
     # We rescue these so that we can skip bad versions and
     # continue walking the history
-    odebug "#{e} in #{name} at revision #{rev}", e.backtrace if debug?
+    odebug "#{e} in #{name} at revision #{rev}", e.backtrace
   rescue FormulaUnavailableError
     nil
   ensure
@@ -69,7 +69,7 @@ class FormulaVersions
       end
       return map if versions_seen > MAX_VERSIONS_DEPTH
     rescue MacOSVersionError => e
-      odebug "#{e} in #{name} at revision #{rev}" if debug?
+      odebug "#{e} in #{name} at revision #{rev}"
       break
     end
     map