Merge "possible NULL pointer dereference"