Merge "Add null check if shared user not found." into tm-dev