Merge "Fix a nullness warning."