Merge "Add null checks"