Enhance location validation/error handling