Merge "Properly handle null URIs." into cm-11.0