1 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/breakpoint.rb b/railties/lib/breakpoint.rb
index 9c3164b2eb..dccde0b11d 100755
--- a/railties/lib/breakpoint.rb
+++ b/railties/lib/breakpoint.rb
@@ -141,7 +141,7 @@ module Breakpoint
         end
 
         unless [true, false, nil].include?(result)
-          result.extend(DRbUndumped) rescue nil
+          result.extend(DRbUndumped) if result
         end
 
         return result
@@ -188,7 +188,7 @@ module Breakpoint
         @__bp_file = #{file.inspect}
         @__bp_line = #{line}
         extend Breakpoint::CommandBundle
-        extend DRbUndumped
+        extend DRbUndumped if self
       }, context) rescue nil
 
       if not use_drb? then