diff --git a/build.gradle.kts b/build.gradle.kts
index a25aa4a..a9ad4ee 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -10,7 +10,7 @@ plugins {
 }
 
 group = "com.bitaspire"
-version = "1.2.8"
+version = "1.2.9"
 
 repositories {
     mavenLocal()
diff --git a/src/main/java/com/bitaspire/cyberlevels/UserManagerImpl.java b/src/main/java/com/bitaspire/cyberlevels/UserManagerImpl.java
index e30ae5d..34150cb 100644
--- a/src/main/java/com/bitaspire/cyberlevels/UserManagerImpl.java
+++ b/src/main/java/com/bitaspire/cyberlevels/UserManagerImpl.java
@@ -336,8 +336,9 @@ private void finishUserLoad(UUID uuid, Player player, LoadResult result, boolean
 
         LevelUser<N> existing = users.get(uuid);
         if (existing != null) {
-            if (player != null && !existing.isOnline())
-                users.put(uuid, toOnlineUser(uuid, existing));
+            if (player != null && !existing.isOnline()) {
+                users.put(uuid, toOnlineUser(uuid, result.user));
+            }
 
             if (result.databaseUpdatedAt > 0L) {
                 knownDatabaseUpdatedAt.put(uuid, result.databaseUpdatedAt);
diff --git a/src/main/java/com/bitaspire/cyberlevels/command/CLVCommand.java b/src/main/java/com/bitaspire/cyberlevels/command/CLVCommand.java
index 5cd65d4..970a756 100644
--- a/src/main/java/com/bitaspire/cyberlevels/command/CLVCommand.java
+++ b/src/main/java/com/bitaspire/cyberlevels/command/CLVCommand.java
@@ -379,7 +379,17 @@ private LevelUser<?> resolveUserByName(String name) {
     }
 
     private boolean sendLevelInfo(Player player) {
+        if (player == null) return true;
+
         LevelUser<?> user = main.userManager().getUser(player);
+        if (user == null)
+            return main.cache().lang().sendMessage(
+                player,
+                Lang::getPlayerNotFound,
+                "player",
+                player.getName()
+            );
+
         LevelSystem<?> system = main.levelSystem();
 
         return main.cache().lang().sendMessage(