Removed support for explicit null URIs.

Change-Id: I0917ef9c42c1e0007b95717f5ced0371448c346d