Bug 973401 - Handle null from GetURI. r=smaug
Bug 960828 - More diagnostics. r=mccr8