diff --git a/source/java/org/alfresco/filesys/server/config/ServerConfiguration.java b/source/java/org/alfresco/filesys/server/config/ServerConfiguration.java
index 63204e6871..f977a12ebf 100644
--- a/source/java/org/alfresco/filesys/server/config/ServerConfiguration.java
+++ b/source/java/org/alfresco/filesys/server/config/ServerConfiguration.java
@@ -2393,12 +2393,13 @@ public class ServerConfiguration implements ApplicationListener
                 // Get the NetBIOS name list from the browse master
 
                 NetBIOSNameList nbNameList = NetBIOSSession.FindNamesForAddress(nbName.getIPAddressString(0));
-                nbName = nbNameList.findName(NetBIOSName.MasterBrowser, false);
-
-                // Set the domain/workgroup name
-
-                if (nbName != null)
-                    domainName = nbName.getName();
+                if (nbNameList != null)
+                {
+                    nbName = nbNameList.findName(NetBIOSName.MasterBrowser, false);
+                    // Set the domain/workgroup name
+                    if (nbName != null)
+                        domainName = nbName.getName();
+                }
             }
             catch (IOException ex)
             {