diff --git a/SpigotCore_Main/src/de/steamwar/scoreboard/SWScoreboard.java b/SpigotCore_Main/src/de/steamwar/scoreboard/SWScoreboard.java
index 9ccf6db..958b08d 100644
--- a/SpigotCore_Main/src/de/steamwar/scoreboard/SWScoreboard.java
+++ b/SpigotCore_Main/src/de/steamwar/scoreboard/SWScoreboard.java
@@ -45,25 +45,29 @@ public class SWScoreboard {
         if(!playerBoards.containsKey(player))
             return;
 
-        switch (Core.getVersion()) {
-            case 8:
-                ((SWScoreboard_8) playerBoards.get(player)).deleteScoreboard(player);
-                break;
-            case 9:
-                ((SWScoreboard_9) playerBoards.get(player)).deleteScoreboard(player);
-                break;
-            case 10:
-                ((SWScoreboard_10) playerBoards.get(player)).deleteScoreboard(player);
-                break;
-            case 12:
-                ((SWScoreboard_12) playerBoards.get(player)).deleteScoreboard(player);
-                break;
-            case 14:
-                ((SWScoreboard_14) playerBoards.get(player)).deleteScoreboard(player);
-                break;
-            case 15:
-                ((SWScoreboard_15) playerBoards.get(player)).deleteScoreboard(player);
-                break;
+        try{
+            switch (Core.getVersion()) {
+                case 8:
+                    ((SWScoreboard_8) playerBoards.get(player)).deleteScoreboard(player);
+                    break;
+                case 9:
+                    ((SWScoreboard_9) playerBoards.get(player)).deleteScoreboard(player);
+                    break;
+                case 10:
+                    ((SWScoreboard_10) playerBoards.get(player)).deleteScoreboard(player);
+                    break;
+                case 12:
+                    ((SWScoreboard_12) playerBoards.get(player)).deleteScoreboard(player);
+                    break;
+                case 14:
+                    ((SWScoreboard_14) playerBoards.get(player)).deleteScoreboard(player);
+                    break;
+                case 15:
+                    ((SWScoreboard_15) playerBoards.get(player)).deleteScoreboard(player);
+                    break;
+            }
+        }catch(NullPointerException e){
+            //ignored
         }
         playerBoards.remove(player);
     }