Merge "Verify op_ is not a nullptr"