Merge "Fixed nullptr check."