Added extra check before save the player