When State field is required in a profile, and a Country is selected that has no states, form can never be submitted

If you have a profile that has a required State field and a Country is selected that has no states (such as Tokelau, or Åland Islands), then submitting the form is impossible since the State dropdown is blank. I doubt very many people run into this problem, but we recently had someone unable to donate to us because of this. There should be a validation exception for State, making it not required (even if required is checked) if there are no states.