diff --git a/compiler/forget/src/Babel/BabelPlugin.ts b/compiler/forget/src/Babel/BabelPlugin.ts
index b6018a82dd..e04b7d3a16 100644
--- a/compiler/forget/src/Babel/BabelPlugin.ts
+++ b/compiler/forget/src/Babel/BabelPlugin.ts
@@ -25,6 +25,7 @@ import {
 
 type BabelPluginPass = {
   opts: PluginOptions;
+  filename: string | null;
 };
 
 function hasUseForgetDirective(directive: t.Directive): boolean {
@@ -108,7 +109,7 @@ export default function ReactForgetBabelPlugin(
       ) {
         throw err;
       } else {
-        console.error(err);
+        console.error(formatErrorsForConsole(err, pass.filename ?? null));
       }
     } finally {
       // We are generating a new FunctionDeclaration node, so we must skip over it or this
@@ -149,7 +150,7 @@ export default function ReactForgetBabelPlugin(
         if (options.panicOnBailout || error.isCritical()) {
           throw error;
         } else {
-          console.error(error);
+          console.error(formatErrorsForConsole(error, pass.filename));
         }
         return;
       }
@@ -192,7 +193,7 @@ export default function ReactForgetBabelPlugin(
             },
           });
 
-          const reason = `Skipped compilation as it disables one or more React eslint rules`;
+          const reason = `One or more React eslint rules is disabled`;
           const error = new CompilerError();
           for (const violation of violations) {
             if (options.logger != null) {
@@ -218,7 +219,9 @@ export default function ReactForgetBabelPlugin(
             if (options.panicOnBailout || error.isCritical()) {
               throw error;
             } else {
-              console.error(error);
+              console.error(
+                formatErrorsForConsole(error, pass.filename ?? null)
+              );
             }
           }
 
@@ -228,6 +231,7 @@ export default function ReactForgetBabelPlugin(
         path.traverse(visitor, {
           ...pass,
           opts: { ...pass.opts, ...options },
+          filename: pass.filename ?? null,
         });
 
         // If there isn't already an import of * as React, insert it so useMemoCache doesn't
@@ -327,6 +331,19 @@ function shouldCompile(
   return true;
 }
 
+function formatErrorsForConsole(
+  error: CompilerError,
+  filename: string | null
+): string {
+  const filenameStr = filename ? `in ${filename}` : "";
+  return error.details
+    .map(
+      (e) =>
+        `[ReactForget] Skipping compilation of component ${filenameStr}: ${e.printErrorMessage()}`
+    )
+    .join("\n");
+}
+
 function makeError(
   reason: string,
   loc: t.SourceLocation | null
@@ -349,7 +366,7 @@ function buildFunctionDeclaration(
 ): BabelCore.NodePath<t.FunctionDeclaration> | CompilerError {
   if (!fn.parentPath.isVariableDeclarator()) {
     return makeError(
-      "Skipping compilation: ArrowFunctionExpression must be declared in variable declaration",
+      "ArrowFunctionExpression must be declared in variable declaration",
       fn.node.loc ?? null
     );
   }
diff --git a/compiler/forget/src/__tests__/fixtures/compiler/error._todo.multi-arrow-expr-export-default-gating-test.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/error._todo.multi-arrow-expr-export-default-gating-test.expect.md
index 98532f5ccf..fbac6be13b 100644
--- a/compiler/forget/src/__tests__/fixtures/compiler/error._todo.multi-arrow-expr-export-default-gating-test.expect.md
+++ b/compiler/forget/src/__tests__/fixtures/compiler/error._todo.multi-arrow-expr-export-default-gating-test.expect.md
@@ -18,7 +18,7 @@ export default Renderer = (props) => (
 ## Error
 
 ```
-[ReactForget] InvalidInput: Skipping compilation: ArrowFunctionExpression must be declared in variable declaration (4:9)
+[ReactForget] InvalidInput: ArrowFunctionExpression must be declared in variable declaration (4:9)
 ```
           
       
\ No newline at end of file
diff --git a/compiler/forget/src/__tests__/fixtures/compiler/error.file-has-non-critical-errors.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/error.file-has-non-critical-errors.expect.md
deleted file mode 100644
index c9988f4024..0000000000
--- a/compiler/forget/src/__tests__/fixtures/compiler/error.file-has-non-critical-errors.expect.md
+++ /dev/null
@@ -1,54 +0,0 @@
-
-## Input
-
-```javascript
-// @panicOnBailout false
-function Bad() {
-  var x = 1;
-  return <div>{x}</div>;
-}
-
-function Good() {
-  const x = 1;
-  return <div>{x}</div>;
-}
-
-```
-
-## Code
-
-```javascript
-import { unstable_useMemoCache as useMemoCache } from "react"; // @panicOnBailout false
-function Bad() {
-  var x = 1;
-  return <div>{x}</div>;
-}
-
-function Good() {
-  const $ = useMemoCache(1);
-  let t0;
-  if ($[0] === Symbol.for("react.memo_cache_sentinel")) {
-    t0 = <div>{1}</div>;
-    $[0] = t0;
-  } else {
-    t0 = $[0];
-  }
-  return t0;
-}
-
-```
-
-## Error
-
-```
-[ReactForget] TodoError: (BuildHIR::lowerStatement) Handle var kinds in VariableDeclaration
-  1 | // @panicOnBailout false
-  2 | function Bad() {
-> 3 |   var x = 1;
-    |   ^^^^^^^^^^
-  4 |   return <div>{x}</div>;
-  5 | }
-  6 |
-```
-          
-      
\ No newline at end of file
diff --git a/compiler/forget/src/__tests__/fixtures/compiler/error.file-has-non-critical-errors.js b/compiler/forget/src/__tests__/fixtures/compiler/error.file-has-non-critical-errors.js
deleted file mode 100644
index 7aa1ea53d4..0000000000
--- a/compiler/forget/src/__tests__/fixtures/compiler/error.file-has-non-critical-errors.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// @panicOnBailout false
-function Bad() {
-  var x = 1;
-  return <div>{x}</div>;
-}
-
-function Good() {
-  const x = 1;
-  return <div>{x}</div>;
-}
diff --git a/compiler/forget/src/__tests__/fixtures/compiler/error.sketchy-code-use-forget.expect.md b/compiler/forget/src/__tests__/fixtures/compiler/error.sketchy-code-use-forget.expect.md
index aebd4e68c4..7bfdcd523a 100644
--- a/compiler/forget/src/__tests__/fixtures/compiler/error.sketchy-code-use-forget.expect.md
+++ b/compiler/forget/src/__tests__/fixtures/compiler/error.sketchy-code-use-forget.expect.md
@@ -16,7 +16,7 @@ function lowercasecomponent() {
 ## Error
 
 ```
-[ReactForget] UnsafeInput: Skipped compilation as it disables one or more React eslint rules. eslint-disable react-hooks/rules-of-hooks (1:1)
+[ReactForget] UnsafeInput: One or more React eslint rules is disabled. eslint-disable react-hooks/rules-of-hooks (1:1)
 ```
           
       
\ No newline at end of file