Fix to Nullpointer

Fixes to calling player2/player1 when it may have never existed