Merge "Fix status on exception message" into udc-dev