Added more location services, disabled crash on location not found