Merge "null check before dereference" into oc-dev