Added dependency to UserLocations; better failure handling