diff --git a/Source/NSPortNameServer.m b/Source/NSPortNameServer.m
index cd12cbde9..90a355236 100644
--- a/Source/NSPortNameServer.m
+++ b/Source/NSPortNameServer.m
@@ -84,9 +84,9 @@ static NSPortNameServer	*defaultServer = nil;
   if (self == [NSPortNameServer class])
     {
       [gnustep_global_lock lock];
-      serverLock = [NSRecursiveLock new];
-      if (modes == nil)
+      if (serverLock == nil)
 	{
+          serverLock = [NSRecursiveLock new];
 	  modes = [[NSArray alloc] initWithObjects: &mode count: 1];
 	} 
       [gnustep_global_lock unlock];