diff --git a/jest-exception-reporter.mjs b/jest-exception-reporter.mjs
index 38a807ef1..a556f1187 100644
--- a/jest-exception-reporter.mjs
+++ b/jest-exception-reporter.mjs
@@ -39,189 +39,32 @@ export default class JestExceptionReporter {
     if (!testResult) return;
     const filePath = testResult.testFilePath || (test && test.path) || 'unknown';
 
-    const parseFailureMessage = (msg) => {
-      if (!msg || typeof msg !== 'string') return { raw: msg };
-      // Jest failureMessages are strings. Try to split into message + stack.
-      // The first line is usually the error message, rest is stack trace.
-      const lines = msg.split('\n');
-      const firstLine = lines[0] || '';
-      const rest = lines.slice(1).join('\n').trim();
-
-      // Try to find a JSON object at the end of the message (if tests serialized errors)
-      let parsed = null;
-      try {
-        const jsonMatch = msg.match(/(\{[\s\S]*\})\s*$/);
-        if (jsonMatch) {
-          parsed = JSON.parse(jsonMatch[1]);
-        } else {
-          // sometimes the first line itself may be JSON
-          const maybeJson = firstLine.trim();
-          if (maybeJson.startsWith('{') && maybeJson.endsWith('}')) {
-            parsed = JSON.parse(maybeJson);
-          }
-        }
-      } catch (e) {
-        // ignore parse errors
-      }
-
-      return {
-        raw: msg,
-        errorMessage: firstLine,
-        stack: rest,
-        parsedError: parsed,
-        isFrodoError: false,
-        frodoFields: null
-      };
-    };
-
-    const buildCombinedMessage = (errObj, seen = new WeakSet()) => {
-      try {
-        if (!errObj || typeof errObj !== 'object') return String(errObj || '');
-
-        // Avoid circular
-        if (seen.has(errObj)) return '[circular]';
-        seen.add(errObj);
-
-        // If runtime object provides getCombinedMessage, use it
-        if (typeof errObj.getCombinedMessage === 'function') {
-          try {
-            return errObj.getCombinedMessage();
-          } catch (e) {
-            // fall through to manual build
-          }
-        }
-
-        let combined = errObj.message || errObj.errorMessage || '';
-
-        const originals = errObj.originalErrors || errObj.getOriginalErrors || null;
-        let origList = null;
-        if (typeof originals === 'function') {
-          try {
-            origList = originals();
-          } catch (e) {
-            origList = null;
-          }
-        } else if (Array.isArray(originals)) {
-          origList = originals;
-        }
-
-        if (origList && origList.length) {
-          origList.forEach(error => {
-            if (!error) return;
-            if (error.name === 'FrodoError' || (error && (error.originalErrors || error.getOriginalErrors))) {
-              combined += '\n  ' + buildCombinedMessage(error, seen).replace(/^/gm, '  ');
-            } else if (error && error.message) {
-              combined += '\n  ' + error.message;
-            } else {
-              // fallback to JSON
-              try {
-                combined += '\n  ' + JSON.stringify(error);
-              } catch (e) {
-                combined += '\n  ' + String(error);
-              }
-            }
-          });
-        }
-
-        return combined;
-      } catch (e) {
-        return errObj && errObj.message ? errObj.message : String(errObj);
-      }
-    };
-
     (testResult.testResults || []).forEach(assertion => {
       if (assertion.status === 'failed') {
         // Prefer structured failure details if available (some runners include objects)
         const details = assertion.failureDetails && assertion.failureDetails.length ? assertion.failureDetails : null;
         if (details) {
           details.forEach(detail => {
-            let isFrodo = false;
-            let frodoFields = null;
             try {
               if (detail && typeof detail === 'object') {
                 // Check name property
                 if (detail.name === 'FrodoError') {
-                  isFrodo = true;
-                  frodoFields = {
-                    message: detail.message,
-                    originalErrors: detail.originalErrors || detail.getOriginalErrors || null,
-                    isHttpError: detail.isHttpError || null,
-                    httpCode: detail.httpCode || null,
-                    httpStatus: detail.httpStatus || null
-                  };
+                  detail = detail.getCombinedMessage();
                 }
               }
             } catch (e) {
               // ignore
             }
 
-            // compute combined message if FrodoError
-            let combinedMessage = null;
-            if (isFrodo) {
-              try {
-                if (typeof detail.getCombinedMessage === 'function') {
-                  combinedMessage = detail.getCombinedMessage();
-                } else {
-                  combinedMessage = buildCombinedMessage(detail);
-                }
-              } catch (e) {
-                combinedMessage = null;
-              }
-            }
-
             // Log what we found
             this.logger.error('test-failure', {
               file: filePath,
               fullName: assertion.fullName,
               ancestorTitles: assertion.ancestorTitles,
               title: assertion.title,
-              isFrodoError: isFrodo,
-              frodoFields,
-              combinedMessage,
               detail
             });
           });
-        } else {
-          (assertion.failureMessages || []).forEach(msg => {
-            const parsed = parseFailureMessage(msg);
-
-            // Heuristic: if the first line or raw contains 'FrodoError' or 'FrodoError:' mark it
-            const containsFrodo = typeof parsed.errorMessage === 'string' && /FrodoError/.test(parsed.errorMessage || parsed.raw);
-            let frodoFields = null;
-            if (containsFrodo && parsed.parsedError && typeof parsed.parsedError === 'object') {
-              frodoFields = parsed.parsedError;
-            }
-
-            let combinedMessage = null;
-            if (containsFrodo) {
-              try {
-                if (parsed.parsedError && typeof parsed.parsedError.getCombinedMessage === 'function') {
-                  // prefer the method on the error object if available
-                  combinedMessage = parsed.parsedError.getCombinedMessage();
-                } else if (parsed.parsedError && typeof parsed.parsedError === 'object') {
-                  combinedMessage = buildCombinedMessage(parsed.parsedError);
-                } else {
-                  combinedMessage = null;
-                }
-              } catch (e) {
-                combinedMessage = null;
-              }
-            }
-
-            this.logger.error('test-failure', {
-              file: filePath,
-              fullName: assertion.fullName,
-              ancestorTitles: assertion.ancestorTitles,
-              title: assertion.title,
-              isFrodoError: Boolean(containsFrodo),
-              frodoFields,
-              combinedMessage,
-              errorMessage: parsed.errorMessage,
-              stack: parsed.stack,
-              parsedError: parsed.parsedError,
-              rawMessage: parsed.raw
-            });
-          });
         }
       }
     });
diff --git a/src/ops/FrodoError.ts b/src/ops/FrodoError.ts
index e664c6d8f..f88db0b15 100644
--- a/src/ops/FrodoError.ts
+++ b/src/ops/FrodoError.ts
@@ -57,6 +57,8 @@ export class FrodoError extends Error {
           : null
         : null;
     }
+    
+    super.message = this.getCombinedMessage();
   }
 
   getOriginalErrors(): Error[] {