Fixes #710 - Add null check protection to state and country fields.    UK client was getting null pointer due to lack of state field.