Merge "Clean up possible null dereference warning."