Merge "Fix null check" into udc-dev