diff --git a/src/main/java/com/gmail/nossr50/util/scoreboards/ScoreboardManager.java b/src/main/java/com/gmail/nossr50/util/scoreboards/ScoreboardManager.java
index 949f39552..f2668c24e 100644
--- a/src/main/java/com/gmail/nossr50/util/scoreboards/ScoreboardManager.java
+++ b/src/main/java/com/gmail/nossr50/util/scoreboards/ScoreboardManager.java
@@ -154,7 +154,7 @@ public class ScoreboardManager {
     public static void teardownPlayer(Player player) {
         ScoreboardWrapper wrapper = PLAYER_SCOREBOARDS.remove(player.getName());
 
-        if (wrapper.revertTask != null) {
+        if (wrapper != null && wrapper.revertTask != null) {
             wrapper.revertTask.cancel();
         }
     }