diff --git a/Source/NSSocketPortNameServer.m b/Source/NSSocketPortNameServer.m
index 982664029..1b7da998b 100644
--- a/Source/NSSocketPortNameServer.m
+++ b/Source/NSSocketPortNameServer.m
@@ -183,8 +183,10 @@ typedef enum {
   if (e != nil)
     {
       NSDebugMLLog(@"NSSocketPortNameServer",
-	@"failed connect to gdomap on %@ - %@",
-	[[notification object] socketAddress], e);
+	@"failed connect to gdomap on %@:%@ - %@",
+	[[notification object] socketAddress],
+	[[notification object] socketService],
+        e);
       /*
        * Remove our file handle, then either retry or fail.
        */
@@ -251,8 +253,9 @@ typedef enum {
   if (d == nil || [d length] == 0)
     {
       [self fail];
-      NSLog(@"NSSocketPortNameServer lost connection to gdomap on %@",
-	[[notification object] socketAddress]);
+      NSLog(@"NSSocketPortNameServer lost connection to gdomap on %@:%@",
+	[[notification object] socketAddress],
+	[[notification object] socketService]);
     }
   else
     {
@@ -321,8 +324,10 @@ typedef enum {
   if (e != nil)
     {
       [self fail];
-      NSLog(@"NSSocketPortNameServer failed write to gdomap on %@ - %@",
-	[[notification object] socketAddress], e);
+      NSLog(@"NSSocketPortNameServer failed write to gdomap on %@:%@ - %@",
+	[[notification object] socketAddress],
+	[[notification object] socketService],
+        e);
     }
   else
     {