Improving checks and error messages on location search