diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/scoreboard/GameScoreboard.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/scoreboard/GameScoreboard.java
index 3182295bf..bd75a6ff6 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/scoreboard/GameScoreboard.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/scoreboard/GameScoreboard.java
@@ -95,7 +95,17 @@ public class GameScoreboard
 		if (teamName == null)
 			teamName = "";
 
-		_scoreboard.getTeam(Game.Manager.GetClients().Get(player).GetRank().Name + teamName).addPlayer(player);
+		String team = Game.Manager.GetClients().Get(player).GetRank().Name + teamName;
+		
+		try
+		{
+			_scoreboard.getTeam(team).addPlayer(player);
+		}
+		catch (Exception e)
+		{
+			e.printStackTrace();
+			System.out.println("ERROR ADDING PLAYER TO TEAM: " + team);
+		}
 	}
 
 	public void ResetScore(String line)