avoid notifying null Uris

I'm going to let this one go until we have a chance to chat about a solution.  Ill also add a ticket for this issue.