Merge "Add nullptr checks"