Merge "Add error handling to prevent IllegalArgumentException" into udc-qpr-dev