I believe the problem could be solved very easily by interjecting a check for role at the beginning of the victory session. If no role on every character drop into the pick role routine , then continue in with the victory routine after all eligible characters have chosen a role