Merge "Add nullptr check" into oc-mr1-dev