diff --git a/.changeset/sweet-spies-play.md b/.changeset/sweet-spies-play.md
new file mode 100644
index 0000000000..e699ee2f71
--- /dev/null
+++ b/.changeset/sweet-spies-play.md
@@ -0,0 +1,6 @@
+---
+"trigger.dev": patch
+"@trigger.dev/core": patch
+---
+
+Correctly display errors on attempts and during indexing
diff --git a/apps/webapp/app/v3/services/crashTaskRun.server.ts b/apps/webapp/app/v3/services/crashTaskRun.server.ts
index e71c3717b1..6a337c000e 100644
--- a/apps/webapp/app/v3/services/crashTaskRun.server.ts
+++ b/apps/webapp/app/v3/services/crashTaskRun.server.ts
@@ -97,7 +97,7 @@ export class CrashTaskRunService extends BaseService {
           event: event,
           crashedAt: opts.crashedAt,
           exception: {
-            type: "Worker crashed",
+            type: opts.errorCode ?? "TASK_RUN_CRASHED",
             message: opts.reason,
             stacktrace: opts.logs,
           },
@@ -119,6 +119,7 @@ export class CrashTaskRunService extends BaseService {
         {
           reason: opts.reason,
           logs: opts.logs,
+          code: opts.errorCode,
         }
       );
     }
diff --git a/packages/cli-v3/src/entryPoints/deploy-index-controller.ts b/packages/cli-v3/src/entryPoints/deploy-index-controller.ts
index 9232c9acf5..5822acecd5 100644
--- a/packages/cli-v3/src/entryPoints/deploy-index-controller.ts
+++ b/packages/cli-v3/src/entryPoints/deploy-index-controller.ts
@@ -61,7 +61,7 @@ async function indexDeployment({
     const $env = await cliApiClient.getEnvironmentVariables(projectRef);
 
     if (!$env.success) {
-      throw new Error(`Failed to fetch environment variables: ${env.error}`);
+      throw new Error(`Failed to fetch environment variables: ${$env.error}`);
     }
 
     const workerManifest = await indexWorkerManifest({
diff --git a/packages/cli-v3/src/entryPoints/deploy-run-controller.ts b/packages/cli-v3/src/entryPoints/deploy-run-controller.ts
index 8b3bc88611..949d262b05 100644
--- a/packages/cli-v3/src/entryPoints/deploy-run-controller.ts
+++ b/packages/cli-v3/src/entryPoints/deploy-run-controller.ts
@@ -784,12 +784,6 @@ class ProdWorker {
               error,
             });
 
-            try {
-              await this._taskRunProcess.cancel();
-            } catch (error) {
-              logger.error("Failed to cancel task run process", { error });
-            }
-
             try {
               await this.#submitAttemptCompletion(execution, {
                 id: execution.run.id,
diff --git a/packages/core/src/v3/errors.ts b/packages/core/src/v3/errors.ts
index 17ae534149..f63f48b99f 100644
--- a/packages/core/src/v3/errors.ts
+++ b/packages/core/src/v3/errors.ts
@@ -395,6 +395,13 @@ export function exceptionEventEnhancer(
       }
       break;
     }
+    case TaskRunErrorCodes.TASK_PROCESS_MAYBE_OOM_KILLED:
+    case TaskRunErrorCodes.TASK_PROCESS_OOM_KILLED: {
+      return {
+        ...exception,
+        ...prettyInternalErrors[exception.type],
+      };
+    }
   }
 
   return exception;