diff --git a/Library/Homebrew/debrew.rb b/Library/Homebrew/debrew.rb
index b2832816be..546b790fb9 100644
--- a/Library/Homebrew/debrew.rb
+++ b/Library/Homebrew/debrew.rb
@@ -40,7 +40,7 @@ def debrew(exception, formula=nil)
   raise exception unless $debugged_exceptions.add?(exception)
 
   puts "#{exception.backtrace.first}"
-  puts "#{Tty.red}#{exception.class.to_s}#{Tty.reset}: #{exception.to_s}"
+  puts "#{Tty.red}#{exception.class.name}#{Tty.reset}: #{exception}"
 
   begin
     again = false
diff --git a/Library/Homebrew/requirement.rb b/Library/Homebrew/requirement.rb
index 3424037752..318f21eff7 100644
--- a/Library/Homebrew/requirement.rb
+++ b/Library/Homebrew/requirement.rb
@@ -80,7 +80,7 @@ class Requirement
   private
 
   def infer_name
-    klass = self.class.to_s
+    klass = self.class.name || self.class.to_s
     klass.sub!(/(Dependency|Requirement)$/, '')
     klass.sub!(/^(\w+::)*/, '')
     klass.downcase