diff --git a/common/src/main/java/org/geysermc/floodgate/link/GlobalPlayerLinking.java b/common/src/main/java/org/geysermc/floodgate/link/GlobalPlayerLinking.java
index 567db4d1..65288ec9 100644
--- a/common/src/main/java/org/geysermc/floodgate/link/GlobalPlayerLinking.java
+++ b/common/src/main/java/org/geysermc/floodgate/link/GlobalPlayerLinking.java
@@ -27,6 +27,7 @@ package org.geysermc.floodgate.link;
 
 import static org.geysermc.floodgate.util.Constants.GET_BEDROCK_LINK;
 
+import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
@@ -111,13 +112,14 @@ public class GlobalPlayerLinking extends CommonPlayerLink {
 
                     JsonObject data = response.getResponse().getAsJsonObject("data");
 
-                    // no link if data is empty
-                    if (data.size() == 0) {
+                    JsonElement javaName = data.get("java_name");
+                    // javaName will be null when the player isn't linked
+                    if (javaName == null) {
                         return null;
                     }
 
                     return LinkedPlayer.of(
-                            data.get("java_name").getAsString(),
+                            javaName.getAsString(),
                             UUID.fromString(data.get("java_id").getAsString()),
                             Utils.getJavaUuid(data.get("bedrock_id").getAsLong()));
                 },
@@ -158,7 +160,7 @@ public class GlobalPlayerLinking extends CommonPlayerLink {
                     JsonObject data = response.getResponse().getAsJsonObject("data");
 
                     // no link if data is empty, otherwise the player is linked
-                    return data.size() != 0;
+                    return data.entrySet().size() != 0;
                 },
                 getExecutorService());
     }
diff --git a/common/src/main/java/org/geysermc/floodgate/player/FloodgateHandshakeHandler.java b/common/src/main/java/org/geysermc/floodgate/player/FloodgateHandshakeHandler.java
index 99f6f04e..ab8eba9b 100644
--- a/common/src/main/java/org/geysermc/floodgate/player/FloodgateHandshakeHandler.java
+++ b/common/src/main/java/org/geysermc/floodgate/player/FloodgateHandshakeHandler.java
@@ -282,7 +282,14 @@ public final class FloodgateHandshakeHandler {
             return CompletableFuture.completedFuture(new ObjectObjectImmutablePair<>(data, null));
         }
         return api.getPlayerLink().getLinkedPlayer(Utils.getJavaUuid(data.getXuid()))
-                .thenApply(link -> new ObjectObjectImmutablePair<>(data, link));
+                .thenApply(link -> new ObjectObjectImmutablePair<>(data, link))
+                .handle((result, error) -> {
+                    if (error != null) {
+                        logger.error("The player linking implementation returned an error", error.getCause());
+                        return new ObjectObjectImmutablePair<>(data, null);
+                    }
+                    return result;
+                });
     }
 
     public enum ResultType {