diff -r 50f852e7ad82 -r f091f69d59e4 gameServer2/src/server/handlers/inroom.rs --- a/gameServer2/src/server/handlers/inroom.rs Tue Jun 26 23:20:28 2018 -0400 +++ b/gameServer2/src/server/handlers/inroom.rs Wed Jun 27 17:58:33 2018 +0300 @@ -262,8 +262,10 @@ c.is_in_game = false; actions.push(ClientFlags("-g".to_string(), vec![c.nick.clone()]). send_all().in_room(r.id).action()); - for team in r.client_teams(c.id) { - actions.push(SendTeamRemovalMessage(team.name.clone())); + if r.game_info.is_some() { + for team in r.client_teams(c.id) { + actions.push(SendTeamRemovalMessage(team.name.clone())); + } } } }