diff --git a/src/main/java/com/garbagemule/MobArena/ScoreboardManager.java b/src/main/java/com/garbagemule/MobArena/ScoreboardManager.java
index 1950cc4..73e1125 100644
--- a/src/main/java/com/garbagemule/MobArena/ScoreboardManager.java
+++ b/src/main/java/com/garbagemule/MobArena/ScoreboardManager.java
@@ -44,7 +44,11 @@ public class ScoreboardManager {
      * @param player a player
      */
     void removePlayer(Player player) {
-        player.setScoreboard(Bukkit.getScoreboardManager().getMainScoreboard());
+        try {
+            player.setScoreboard(Bukkit.getScoreboardManager().getMainScoreboard());
+        } catch (IllegalStateException e) {
+            // Happens if the player is logging out, just swallow it
+        }
     }
 
     /**