Feature/add location map

fix crash when location not available yet