Merge "Fix NPE when querying EF Uri with non-existent subscription"