Merge "Add extra null checks" into udc-dev