Merge "Fix null deref crash" into oc-dev