Merge "Add better information for invalid path"