Use new ErrorGenerator decorator