Fix issue in errorconditionhandler