Merge "Null check"