Merge "Null point check"