Merge "Check for null when updating header" into oc-dev