Merge "Add null check"