diff --git a/build.gradle b/build.gradle
index d72f122..ff72756 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ plugins {
 sourceCompatibility = JavaVersion.VERSION_11
 
 group 'com.actualplayer'
-version '1.2.2'
+version '1.2.3'
 description 'A way for the user to login to the server he last connected to.'
 
 repositories {
diff --git a/src/main/java/com/actualplayer/rememberme/handlers/FileHandler.java b/src/main/java/com/actualplayer/rememberme/handlers/FileHandler.java
index a95a9ed..b36dcad 100644
--- a/src/main/java/com/actualplayer/rememberme/handlers/FileHandler.java
+++ b/src/main/java/com/actualplayer/rememberme/handlers/FileHandler.java
@@ -30,13 +30,13 @@ public class FileHandler implements IRememberMeHandler {
             File userFile = FileUtils.getOrCreate(rememberMe.getDataFolderPath().resolve("data"), uuid.toString() + ".yml");
             UserServer userServer = YamlUtils.readFile(userFile, UserServer.class);
 
-            if(userServer == null) return null;
-
-            Optional<RegisteredServer> serverOpt = rememberMe.getServer().getServer(userServer.getServer());
-
             CompletableFuture<String> future = new CompletableFuture<>();
-            future.complete(serverOpt.map(registeredServer -> registeredServer.getServerInfo().getName()).orElse(null));
-
+            if(userServer == null) {
+                future.complete(null);
+            } else {
+                Optional<RegisteredServer> serverOpt = rememberMe.getServer().getServer(userServer.getServer());
+                future.complete(serverOpt.map(registeredServer -> registeredServer.getServerInfo().getName()).orElse(null));
+            }
             return future;
         } catch (IOException ex) {
             return null;