Fixed NPE with the Scoreboard