Fix #344 - Checked for null server on geocoding.
Merge pull request #345 from vreixo/issue344

Fix #344 - Checked for null server on geocoding.