DF#QCADOO-342 exception handling