diff --git a/packages/vue/.changesets/fix-vue-error-handler-null-instance-and-file-fallback.md b/packages/vue/.changesets/fix-vue-error-handler-null-instance-and-file-fallback.md
new file mode 100644
index 00000000..ce832e8f
--- /dev/null
+++ b/packages/vue/.changesets/fix-vue-error-handler-null-instance-and-file-fallback.md
@@ -0,0 +1,8 @@
+---
+bump: patch
+type: fix
+---
+
+Handle null instances and fall back to the SFC filename in the Vue error handler.
+
+Vue 3 invokes `app.config.errorHandler` with a null instance for errors raised outside a component context; the handler now reports those as `[unknown Vue component]` instead of throwing away the original error with a `TypeError` of its own. For components without an explicit `name` or `<script setup>` `__name`, the handler now falls back to the basename of `$options.__file` (set by vue-loader; in production builds only when its `exposeFilename` option is enabled), so errors group per component instead of all under `[unknown Vue component]`.
diff --git a/packages/vue/src/__tests__/index.test.ts b/packages/vue/src/__tests__/index.test.ts
index 1383a247..cffb729a 100644
--- a/packages/vue/src/__tests__/index.test.ts
+++ b/packages/vue/src/__tests__/index.test.ts
@@ -90,4 +90,76 @@ describe("Vue errorHandler", () => {
       version: version
     })
   })
+
+  it("falls back to the basename of the __file option in Vue 3", () => {
+    const err = new Error("test")
+    const version = "v3.0.0"
+
+    const vue3Mock: any = {
+      $options: {
+        __file: "src/components/TestComponent.vue"
+      }
+    }
+
+    errorHandler(appsignal, { version } as VueApp)(err, vue3Mock, "INFO")
+
+    expect(mock.setAction).toBeCalledWith("TestComponent")
+  })
+
+  it("reads a basename-only __file option as exposed in production builds", () => {
+    const err = new Error("test")
+    const version = "v3.0.0"
+
+    const vue3Mock: any = {
+      $options: {
+        __file: "TestComponent.vue"
+      }
+    }
+
+    errorHandler(appsignal, { version } as VueApp)(err, vue3Mock, "INFO")
+
+    expect(mock.setAction).toBeCalledWith("TestComponent")
+  })
+
+  it("prefers an explicit name over the __file option", () => {
+    const err = new Error("test")
+    const version = "v3.0.0"
+
+    const vue3Mock: any = {
+      $options: {
+        name: "ExplicitName",
+        __file: "src/components/TestComponent.vue"
+      }
+    }
+
+    errorHandler(appsignal, { version } as VueApp)(err, vue3Mock, "INFO")
+
+    expect(mock.setAction).toBeCalledWith("ExplicitName")
+  })
+
+  it("reports an unknown component when Vue 3 passes a null instance", () => {
+    const err = new Error("test")
+    const version = "v3.0.0"
+
+    errorHandler(appsignal, { version } as VueApp)(err, null, "INFO")
+
+    expect(mock.setAction).toBeCalledWith("[unknown Vue component]")
+
+    expect(mock.setError).toBeCalledWith(err)
+
+    expect(appsignal.send).toBeCalled()
+  })
+
+  it("reports an unknown component when no name source is present", () => {
+    const err = new Error("test")
+    const version = "v3.0.0"
+
+    const vue3Mock: any = {
+      $options: {}
+    }
+
+    errorHandler(appsignal, { version } as VueApp)(err, vue3Mock, "INFO")
+
+    expect(mock.setAction).toBeCalledWith("[unknown Vue component]")
+  })
 })
diff --git a/packages/vue/src/index.ts b/packages/vue/src/index.ts
index 9cbc7798..2b9737cd 100644
--- a/packages/vue/src/index.ts
+++ b/packages/vue/src/index.ts
@@ -1,17 +1,34 @@
 import { VueApp } from "./types"
 import type Appsignal from "@appsignal/javascript"
 
+function componentName(vm: any): string | undefined {
+  if (vm?.$vnode) {
+    return vm.$vnode.componentOptions.tag // Vue 2
+  }
+
+  // `__file` comes from vue-loader: always in development, in production
+  // only as a basename and only when the app enables its `exposeFilename` option.
+  const options = vm?.$options
+  if (!options) return undefined
+
+  const file = options.__file
+    ?.split("/")
+    .pop()
+    ?.replace(/\.vue$/, "")
+
+  return options.name || options.__name || file
+}
+
 export function errorHandler(appsignal: Appsignal, app?: VueApp) {
   const version = app?.version ?? ""
 
+  // Vue 3 invokes the handler with a null `vm` for errors raised outside a
+  // component context, so nothing here may assume a component instance.
   return function (error: any, vm: any, info: string) {
-    const componentName = vm.$vnode
-      ? vm.$vnode.componentOptions.tag // Vue 2
-      : vm.$options.name || vm.$options.__name // Vue 3
     const span = appsignal.createSpan()
 
     span
-      .setAction(componentName || "[unknown Vue component]")
+      .setAction(componentName(vm) || "[unknown Vue component]")
       .setTags({ framework: "Vue", info, version })
       .setError(error)