diff --git a/src/main/java/fr/xephi/authme/process/quit/AsynchronousQuit.java b/src/main/java/fr/xephi/authme/process/quit/AsynchronousQuit.java
index 2a3a5d3e0..80dd49b99 100644
--- a/src/main/java/fr/xephi/authme/process/quit/AsynchronousQuit.java
+++ b/src/main/java/fr/xephi/authme/process/quit/AsynchronousQuit.java
@@ -61,8 +61,8 @@ public class AsynchronousQuit {
             database.updateSession(auth);
         }
 
-        if (LimboCache.getInstance().hasLimboPlayer(name)) {
-            LimboPlayer limbo = LimboCache.getInstance().getLimboPlayer(name);
+        LimboPlayer limbo = LimboCache.getInstance().getLimboPlayer(name);
+        if (limbo != null) {
             if (limbo.getGroup() != null && !limbo.getGroup().isEmpty())
                 Utils.addNormal(player, limbo.getGroup());
             needToChange = true;