Fix another npe with PlayerStates.
Merge remote-tracking branch 'origin/master'