diff --git a/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDScoreboard.java b/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDScoreboard.java
index f7e3d0f1..71163d63 100644
--- a/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDScoreboard.java
+++ b/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDScoreboard.java
@@ -62,6 +62,12 @@ public class LDScoreboard implements LDCommand {
                         continue;
                     }
 
+                    DisguiseUtilities.DScoreTeam scoreboardName = ((PlayerDisguise) disguise).getScoreboardName();
+
+                    if (scoreboardName.getTeamName() == null) {
+                        continue;
+                    }
+
                     ArrayList<Scoreboard> checked = new ArrayList<>();
 
                     for (Player player : Bukkit.getOnlinePlayers()) {
@@ -72,7 +78,7 @@ public class LDScoreboard implements LDCommand {
                         }
 
                         checked.add(board);
-                        DisguiseUtilities.DScoreTeam scoreboardName = ((PlayerDisguise) disguise).getScoreboardName();
+
 
                         Team team = board.getTeam(scoreboardName.getTeamName());