Merge "fix warning: dereference of a null pointer"