Check that city and state are set before trying to use them. Fixes #4