Merge "Check for null owner info" into oc-dev