diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/BungeeListener.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/BungeeListener.java
index 70e55c5d..8360974e 100644
--- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/BungeeListener.java
+++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/BungeeListener.java
@@ -110,7 +110,7 @@ public class BungeeListener implements PluginMessageListener {
                 }
             }, 10L);
         } else if (type == Type.CRACKED) {
-            //we don't start a forcelogin task here so update it manually
+            //we don't start a force login task here so update it manually
             plugin.getPremiumPlayers().put(player.getUniqueId(), PremiumStatus.CRACKED);
         }
     }
diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/task/ForceLoginTask.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/task/ForceLoginTask.java
index f7d4e639..d32f4af7 100644
--- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/task/ForceLoginTask.java
+++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/task/ForceLoginTask.java
@@ -35,11 +35,12 @@ public class ForceLoginTask extends ForceLoginManagement<Player, CommandSender,
 
         super.run();
 
+        PremiumStatus status = PremiumStatus.CRACKED;
         if (isOnlineMode()) {
-            plugin.getPremiumPlayers().put(player.getUniqueId(), PremiumStatus.PREMIUM);
-        } else {
-            plugin.getPremiumPlayers().put(player.getUniqueId(), PremiumStatus.CRACKED);
+            status = PremiumStatus.PREMIUM;
         }
+
+        plugin.getPremiumPlayers().put(player.getUniqueId(), status);
     }
 
     @Override
@@ -67,6 +68,10 @@ public class ForceLoginTask extends ForceLoginManagement<Player, CommandSender,
 
     @Override
     public boolean isOnlineMode() {
+        if (session == null) {
+            return false;
+        }
+
         return session.isVerified() && player.getName().equals(session.getUsername());
     }
 }