Merge "More path validation for better error message" into pi-dev