Fix #344 - Checked for null server on geocoding.
Fix #346 - Removed old boundaries when adding new ones for custom servers too.
Merge pull request #345 from vreixo/issue344

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

Fix #346 - Removed old boundaries when adding new ones for custom server...