Fix to Nullpointer

Fixes to calling player2/player1 when it may have never existed
Merge pull request #3 from Rhonim/Trade-Machine-Fix

Fix to Nullpointer