#528 [Anuj] fixed the validation for location.