1 files changed, 6 insertions, 3 deletions
diff --git a/lib/drb/drb.rb b/lib/drb/drb.rb
index 3e23213911..34970698bd 100644
--- a/lib/drb/drb.rb
+++ b/lib/drb/drb.rb
@@ -1627,9 +1627,12 @@ module DRb
       end
 
       def perform
-        @result = nil
-        @succ = false
-        setup_message
+        begin
+          setup_message
+        ensure
+          @result = nil
+          @succ = false
+        end
 
         if @block
           @result = perform_with_block