Geolocation

Improved error messaging