Don't throw 'country field missing' error

- Does not throw an error when country is missing, returns as
  error-list.
- Some code cleanup
- 100% code coverage when testing! Jeey!