--- a/SocketAddress.st	Wed Jul 01 23:10:08 2015 +0200
+++ b/SocketAddress.st	Wed Jul 01 23:11:51 2015 +0200
@@ -100,9 +100,10 @@
                     type:socketTypeSymbol
                     protocol:nil 
                     flags:0.
-
-    ^ addressInfo 
-        collect:[:eachAddressInfo| eachAddressInfo socketAddress].
+    addressInfo isNil ifTrue:[
+        ^ nil
+    ].
+    ^ addressInfo collect:[:eachAddressInfo| eachAddressInfo socketAddress].
         
 
     "
@@ -193,6 +194,8 @@
     ].
 
     addressList := self allForHostName:name serviceName:portNrOrName type:socketTypeSymbol.
+    addressList isNil ifTrue:[^ nil].
+
     sa := addressList last.
     addressList size > 1 ifTrue:[
         (addressList contains:[:entry| entry  ~= sa]) ifTrue:[
@@ -863,10 +866,10 @@
 !SocketAddress class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic2/SocketAddress.st,v 1.52 2015-03-09 17:14:52 stefan Exp $'
+    ^ '$Header$'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic2/SocketAddress.st,v 1.52 2015-03-09 17:14:52 stefan Exp $'
+    ^ '$Header$'
 ! !