Merge "Add null pointer check"