Code tidy up.
Added error catching for geocoder