Merge "Fix URI unparceling and clarify an error condition"