diff --git a/Source/Proxy.m b/Source/Proxy.m
index dbc0a8d55..320cf9f34 100644
--- a/Source/Proxy.m
+++ b/Source/Proxy.m
@@ -133,9 +133,11 @@ static id tmp_kludge_protocol = nil;
 - (void) encodeWithCoder: aRmc
 {
   if (![_connection isValid])
-    [self error: "Trying to encode an invalid Proxy.\n"
-	  "You should request ConnectionBecameInvalidNotification's and\n"
-	  "remove all references to the Proxy's of invalid Connections."];
+    [NSException 
+      raise: NSGenericException
+      format: @"Trying to encode an invalid Proxy.\n"
+      @"You should request ConnectionBecameInvalidNotification's and\n"
+      @"remove all references to the Proxy's of invalid Connections."];
   [[self classForConnectedCoder: aRmc] 
    encodeObject: self withConnectedCoder: aRmc];
 }
@@ -177,9 +179,11 @@ enum
   encoder_connection = [aRmc connection];
   assert (encoder_connection);
   if (![encoder_connection isValid])
-    [self error: "Trying to encode to an invalid Connection.\n"
-	  "You should request ConnectionBecameInvalidNotification's and\n"
-	  "remove all references to the Proxy's of invalid Connections."];
+    [NSException 
+      raise: NSGenericException
+      format: @"Trying to encode to an invalid Connection.\n"
+      @"You should request ConnectionBecameInvalidNotification's and\n"
+      @"remove all references to the Proxy's of invalid Connections."];
 
   /* Find out if anObject is a proxy or not. */
   if (class_is_kind_of (object_get_class (anObject), self))
@@ -264,7 +268,9 @@ enum
   id decoder_connection;
 
   if ([aRmc class] != [ConnectedDecoder class])
-    [self error:"Proxy objects only decode with ConnectedDecoder class"];
+    [NSException 
+      raise: NSGenericException
+      format: @"Proxy objects only decode with ConnectedDecoder class"];
 
   decoder_connection = [aRmc connection];
   assert (decoder_connection);
@@ -433,9 +439,11 @@ enum
   if (debug_proxy)
     printf("Proxy forwarding %s\n", sel_get_name(aSel));
   if (![_connection isValid])
-    [self error: "Trying to send message to an invalid Proxy.\n"
-	  "You should request ConnectionBecameInvalidNotification's and\n"
-	  "remove all references to the Proxy's of invalid Connections."];
+    [NSException 
+      raise: NSGenericException
+      format: @"Trying to send message to an invalid Proxy.\n"
+      @"You should request ConnectionBecameInvalidNotification's and\n"
+      @"remove all references to the Proxy's of invalid Connections."];
   return [_connection forwardForProxy: self
 		      selector: aSel
 		      argFrame: frame];