Merge "Fix an incorrect null check"