Merge "Fix exception when path not found."