Better handle teams not in a division