DAR-1498 Simplyfiyng error message handling