Fix NPEs when not using scoreboards.