Merge "Guard against NPE" into oc-mr1-dev