Extra checking for the player data received on join. Attempted partial fix of #1251