DAR-1184: error handling