diff --git a/Source/GSTcpPort.m b/Source/GSTcpPort.m
index 153667119..ee96c228c 100644
--- a/Source/GSTcpPort.m
+++ b/Source/GSTcpPort.m
@@ -624,7 +624,8 @@ static Class	runLoopClass;
 	    }
 	  else if (errno != EINTR && errno != EAGAIN)
 	    {
-	      NSLog(@"read attempt failed - %s", strerror(errno));
+	      NSDebugMLLog(@"GSTcpHandle", @"read attempt failed - %s",
+		strerror(errno));
 	      [self invalidate];
 	      return;
 	    }
diff --git a/Source/NSConnection.m b/Source/NSConnection.m
index 335df987c..7088a785a 100644
--- a/Source/NSConnection.m
+++ b/Source/NSConnection.m
@@ -2238,6 +2238,10 @@ static NSLock	*global_proxies_gate;
     {
       NSString	*text = stringFromMsgType(msgid);
 
+      if ([_sendPort isValid] == NO)
+	{
+	  text = [text stringByAppendingFormat: @" - port was invalidated"];
+	}
       if (raiseException == YES)
 	{
 	  [NSException raise: NSPortTimeoutException format: text];
diff --git a/Source/NSDistantObject.m b/Source/NSDistantObject.m
index 13dc69bcf..c179ba4b0 100644
--- a/Source/NSDistantObject.m
+++ b/Source/NSDistantObject.m
@@ -169,9 +169,9 @@ enum
 	 *	of this object is not on this host, not on the host the
 	 *	NSPortCoder is connected to, but on a *third* host.
 	 *	This is why I call this a "triangle connection".  In addition
-	 *	to decoding the target, we decode the OutPort object that we
+	 *	to decoding the target, we decode the NSPort object that we
 	 *	will use to talk directly to this third host.  We send
-	 *	[NSConnection +newForInPort:outPort:ancestorConnection:]; this
+	 *	[NSConnection +connectionWithReceivePort:sendPort:]; this
 	 *	will either return the connection already created for this
 	 *	inPort/outPort pair, or create a new connection if necessary.
 	 */