A little bit of code cleanup and fix a possible crash with the geocoder