diff --git a/src/server/Server.java b/src/server/Server.java
index d4be96d..6967b65 100644
--- a/src/server/Server.java
+++ b/src/server/Server.java
@@ -40,16 +40,15 @@
 
 		final String name = args.length > 0 ? args[0] : null;
 
-		ComputerNameResolver nameResolver = null;
+		ComputerNameResolver nameResolver = new OtagoComputerNameResolver(name, "CLIENTNAME");
 
 		try {
-			nameResolver = new OtagoComputerNameResolver(name, "CLIENTNAME");
+			nameResolver.resolve();
 		} catch (InvalidComputerNameException ex) {
 			JOptionPane.showMessageDialog(null, "There is no map for this lab yet.\nThe machine ID is : " + name, "No map", JOptionPane.ERROR_MESSAGE);
 			System.exit(Constants.EXIT_NO_MAP_FOUND);
 		}
 
-		nameResolver.resolve();
 
 		final String labName = nameResolver.getLabName();