CAAERS-6611 CAAERS-6610 fix enhance error messages