Make location data optional