Added null check into GeolocService