Merge "Fix check for null at wrong level of indirection."