added error handling around picking a team