Merge "Fix logspam NPE." into oc-dev