diff --git a/paper-api/src/main/java/org/bukkit/scoreboard/Team.java b/paper-api/src/main/java/org/bukkit/scoreboard/Team.java
index c34d9ab72928..02df00200490 100644
--- a/paper-api/src/main/java/org/bukkit/scoreboard/Team.java
+++ b/paper-api/src/main/java/org/bukkit/scoreboard/Team.java
@@ -294,9 +294,9 @@ public interface Team extends net.kyori.adventure.audience.ForwardingAudience {
      *
      * @param player the player to add
      * @throws IllegalStateException if this team has been unregistered
+     * @throws IllegalArgumentException if {@link OfflinePlayer#getName()} is null
      * @see #addEntry(String)
      */
-    // @Deprecated(since = "1.8.6") // Paper
     void addPlayer(@NotNull OfflinePlayer player);
 
     /**
@@ -369,9 +369,9 @@ default void addEntries(@NotNull String... entries) throws IllegalStateException
      * @param player the player to remove
      * @return if the player was on this team
      * @throws IllegalStateException if this team has been unregistered
+     * @throws IllegalArgumentException if {@link OfflinePlayer#getName()} is null
      * @see #removeEntry(String)
      */
-    // @Deprecated(since = "1.8.6") // Paper
     boolean removePlayer(@NotNull OfflinePlayer player);
 
     /**
@@ -446,9 +446,9 @@ default boolean removeEntries(@NotNull String... entries) throws IllegalStateExc
      * @param player the player to search for
      * @return true if the player is a member of this team
      * @throws IllegalStateException if this team has been unregistered
+     * @throws IllegalArgumentException if {@link OfflinePlayer#getName()} is null
      * @see #hasEntry(String)
      */
-    // @Deprecated(since = "1.8.6") // Paper
     boolean hasPlayer(@NotNull OfflinePlayer player);
     /**
      * Checks to see if the specified entry is a member of this team.
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java b/paper-server/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java
index 553778b3a4ff..6058d219f31c 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java
@@ -229,6 +229,7 @@ public int getSize() {
     @Override
     public void addPlayer(OfflinePlayer player) {
         Preconditions.checkArgument(player != null, "OfflinePlayer cannot be null");
+        Preconditions.checkArgument(player.getName() != null, "OfflinePlayer must have a name");
         this.addEntry(player.getName());
     }
 
@@ -256,6 +257,7 @@ public void addEntries(java.util.Collection<String> entries) throws IllegalState
     @Override
     public boolean removePlayer(OfflinePlayer player) {
         Preconditions.checkArgument(player != null, "OfflinePlayer cannot be null");
+        Preconditions.checkArgument(player.getName() != null, "OfflinePlayer must have a name");
         return this.removeEntry(player.getName());
     }
 
@@ -295,6 +297,7 @@ public boolean removeEntries(java.util.Collection<String> entries) throws Illega
     @Override
     public boolean hasPlayer(OfflinePlayer player) throws IllegalArgumentException, IllegalStateException {
         Preconditions.checkArgument(player != null, "OfflinePlayer cannot be null");
+        Preconditions.checkArgument(player.getName() != null, "OfflinePlayer must have a name");
         return this.hasEntry(player.getName());
     }