[fix bug 1026122] Require country, improve location error messages.
Merge pull request #983 from glogiotatidis/1026122

[fix bug 1026122] Require country, improve location error messages.