Add needed return statements

With these possible errors could occur. This also fixes a bug which allowed players to change their race, even if one was set.