Merge "Add a missing null check" into oc-dev