Merge "Fix dereference null pointer warning."