Add check for location name