Fix errors with the scoreboard unregistering.