Move NoUltimateTeam exception to the right place