Updating JoinGame (broken)

Updating JoinGame, not completely updated, will have exception when try
to join a game.