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