Merge "null check"