Fix keys in errorconditionhandler