Merge "Add a null check for a rare error case." into udc-qpr-dev