Merge "fix warning: Dereference of null pointer"