Merge "Fix a null dereference"