Improve error message on geocoding failure
Merge remote-tracking branch '3dna/master'