Merge "Move null check"