Merge "Add null check for uri" into main