diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index cf5028f3c65..45a00fda736 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2003-01-16  Mark Wielaard  <mark@klomp.org>
+
+	* java/net/SocketImpl.java (toString): Don't explicitly call
+	toString() on possible null address.
+
 2003-01-16  Michael Koch  <konqueror@gmx.de>
 
 	* java/net/MulticastSocket.java
diff --git a/libjava/java/net/SocketImpl.java b/libjava/java/net/SocketImpl.java
index 795e7139bee..f0f1a3c87bc 100644
--- a/libjava/java/net/SocketImpl.java
+++ b/libjava/java/net/SocketImpl.java
@@ -271,8 +271,9 @@ public abstract class SocketImpl implements SocketOptions
    */
   public String toString()
   {
-    return "[addr=" + address.toString() + ",port=" + Integer.toString(port)
-      + ",localport=" + Integer.toString(localport) + "]";
+    return "[addr=" + address
+	    + ",port=" + port
+	    + ",localport=" + localport + "]";
   }
 
   /**