diff --git a/SpigotCore_Main/src/de/steamwar/scoreboard/SWScoreboard.java b/SpigotCore_Main/src/de/steamwar/scoreboard/SWScoreboard.java
index 223f0b2..9ccf6db 100644
--- a/SpigotCore_Main/src/de/steamwar/scoreboard/SWScoreboard.java
+++ b/SpigotCore_Main/src/de/steamwar/scoreboard/SWScoreboard.java
@@ -41,13 +41,9 @@ public class SWScoreboard {
         return true;
     }
 
-    public static boolean removeScoreboard(Player player) {
+    public static void removeScoreboard(Player player) {
         if(!playerBoards.containsKey(player))
-            return false;
-
-        playerBoards.remove(player);
-        if(player == null)
-            return true;
+            return;
 
         switch (Core.getVersion()) {
             case 8:
@@ -68,10 +64,8 @@ public class SWScoreboard {
             case 15:
                 ((SWScoreboard_15) playerBoards.get(player)).deleteScoreboard(player);
                 break;
-            default:
-                return false;
         }
-        return true;
+        playerBoards.remove(player);
     }
 
     //Scoreboard Updater