Merge "Properly handle a null URI." into cm-11.0