diff --git a/common/src/main/java/com/viaversion/viarewind/protocol/v1_8to1_7_6_10/storage/GameProfileStorage.java b/common/src/main/java/com/viaversion/viarewind/protocol/v1_8to1_7_6_10/storage/GameProfileStorage.java
index 569b729d2..d5f4f549f 100644
--- a/common/src/main/java/com/viaversion/viarewind/protocol/v1_8to1_7_6_10/storage/GameProfileStorage.java
+++ b/common/src/main/java/com/viaversion/viarewind/protocol/v1_8to1_7_6_10/storage/GameProfileStorage.java
@@ -78,7 +78,9 @@ public List<GameProfile> getAllWithPrefix(String prefix, boolean ignoreCase) {
 
     public GameProfile remove(UUID uuid) {
         GameProfile removedProfile = properties.remove(uuid);
-        nameToProfile.get(removedProfile.name).remove(removedProfile);
+        if (removedProfile != null) {
+            nameToProfile.get(removedProfile.name).remove(removedProfile);
+        }
         return removedProfile;
     }