Merge "Fix "Dereference of null pointer" compiler warning."