Merge "fix a null pointer dereference"