New Individual generates error "State New York does not belong to"

Steps to recreate:
When creating a new individual (myself) I did not select a country but did fill out other city, state and zip information accurately. On submit, I got an error that read only:

"Please correct the following errors in the form fields below:

• State New York does not belong to"

Without any explanation of just what the New York should belong to.

Desired result:

• If state/province is selected and country is blank, look up the correct country for the selected state and use that value for the insert/update operation

• If state/province and country are both selected and the state is a mismatch - throw validation error as done today EXCEPT change error message to 'State/Province $crm_state_province.name is not part of $crm_country.name. It belongs to $correctCountryName.'