Merge "Fix potential NULL dereference"