Merge "avoid null dereference"