diff --git a/ChangeLog b/ChangeLog
index 054a32811..c64e4f692 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-2001-09-20  Richard Frith-Macdonald <rfm@gnu.org>
+2001-09-21  Richard Frith-Macdonald <rfm@gnu.org>
 
         * Headers/gnustep/base/DistributedObjects.h:
         * Source/GSFFCallInvocation.m:
@@ -8,9 +8,8 @@
         * Source/callframe.m:
 	Modifications to callframe handling to store pointers to data to
 	be freed in order to be able to tidy up after an exception ...
-	Appears to cure memory leak in ffcall code on server side.
-	No fix yest for mframe or ffi code, or for client side leak
-	when an exception occurs in the server.
+	Appears to cure memory leak in ffcall code.
+	No fix yest for mframe or ffi code.
 
 2001-09-20  Richard Frith-Macdonald <rfm@gnu.org>
 
diff --git a/Source/NSConnection.m b/Source/NSConnection.m
index 7276ed025..a73c62248 100644
--- a/Source/NSConnection.m
+++ b/Source/NSConnection.m
@@ -1537,20 +1537,15 @@ static void retDecoder(DOContext *ctxt)
       if (is_exception == YES)
 	{
 	  /* Decode the exception object, and raise it. */
-	  id exc;
-	  [coder decodeValueOfObjCType: @encode(id) at: &exc];
+	  id exc = [coder decodeObject];
+
 	  ctxt->decoder = nil;
-	  [ctxt->connection _doneInRmc: coder];
+	  [ctxt->connection _doneInReply: coder];
 	  if (ctxt->datToFree != 0)
 	    {
 	      NSZoneFree(NSDefaultMallocZone(), ctxt->datToFree);
 	      ctxt->datToFree = 0;
 	    }
-	  if (ctxt->objToFree != nil)
-	    {
-	      NSDeallocateObject(ctxt->objToFree);
-	      ctxt->objToFree = nil;
-	    }
 	  [exc raise];
 	}
     }