@@ -977,10 +977,12 @@
 	switch (address->family) {
 	case OFSocketAddressFamilyIPv4:
 		return IPv4String(address);
 	case OFSocketAddressFamilyIPv6:
 		return IPv6String(address);
+	case OFSocketAddressFamilyUNIX:
+		return OFSocketAddressUNIXPath(address);
 	case OFSocketAddressFamilyIPX:
 		return IPXString(address);
 	case OFSocketAddressFamilyAppleTalk:
 		return appleTalkString(address);
 	default:
@@ -1028,13 +1030,10 @@
 
 	for (socklen_t i = 0; i < length; i++)
 		if (address->sockaddr.un.sun_path[i] == 0)
 			length = i;
 
-	if (length <= 0)
-		return nil;
-
 	return [OFString stringWithCString: address->sockaddr.un.sun_path
 				  encoding: [OFLocale encoding]
 				    length: length];
 }