https://github.com/KeepSafe/Switchboard/issues/6

Check country has a value before setting it