diff --git a/src/lib/components/forms/DocumentUpload.svelte b/src/lib/components/forms/DocumentUpload.svelte
index e04abebc8..fcf3916f9 100644
--- a/src/lib/components/forms/DocumentUpload.svelte
+++ b/src/lib/components/forms/DocumentUpload.svelte
@@ -31,7 +31,13 @@ progress through the three-part upload process.
 </script>
 
 <script lang="ts">
-  import type { Access, DocumentUpload, Project } from "$lib/api/types";
+  import type {
+    Access,
+    DocumentUpload,
+    Maybe,
+    Nullable,
+    Project,
+  } from "$lib/api/types";
 
   import { filesize } from "filesize";
   import { onMount } from "svelte";
@@ -65,7 +71,7 @@ progress through the three-part upload process.
   export let files: File[] = getFilesToUpload();
   export let projects: Project[] = [];
 
-  let csrf_token: string;
+  let csrf_token: Maybe<string>;
   let fileDropActive: boolean;
 
   /**
@@ -99,7 +105,9 @@ progress through the three-part upload process.
   ];
 
   let ocrEngine = ocrEngineOptions[0];
-  let add_to_projects: Project[] = [getProjectToUpload()].filter(Boolean);
+  let add_to_projects: Project[] = [getProjectToUpload()].filter(
+    Boolean,
+  ) as Project[];
 
   $: total = Object.values(STATUS).reduce((t, status) => {
     return t + status.file.size;
@@ -171,7 +179,7 @@ progress through the three-part upload process.
         upload(
           id,
           {
-            title: titles[i],
+            title: titles[i] ?? "",
             original_extension: getFileExtension(status.file),
             access,
             projects: add_to_projects.map((p) => p.id),
@@ -190,6 +198,9 @@ progress through the three-part upload process.
 
   // upload one file
   async function upload(id: string, metadata: DocumentUpload, form: FormData) {
+    if (!csrf_token) return;
+    if (!STATUS[id]) return;
+
     const file = STATUS[id].file;
 
     // create
@@ -210,6 +221,18 @@ progress through the three-part upload process.
       return console.error(error);
     }
 
+    if (!document || !document.presigned_url) {
+      STATUS[id] = {
+        ...STATUS[id],
+        error: {
+          status: 500,
+          message: "API returned invalid document. Please try again.",
+        },
+      };
+
+      return;
+    }
+
     // upload
     let presigned_url: URL;
     try {
@@ -220,16 +243,22 @@ progress through the three-part upload process.
         message: "Invalid presigned URL",
         errors: e,
       };
-    }
 
-    if (error) {
       STATUS[id].error = error;
       return console.error(error);
     }
 
+    if (!presigned_url) {
+      STATUS[id].error = {
+        status: 500,
+        message: "Invalid presigned URL",
+      };
+      return;
+    }
+
     STATUS[id].step = "uploading";
     const resp = await documents
-      .upload(new URL(document.presigned_url), file)
+      .upload(presigned_url, file)
       .catch(console.error);
 
     if (!resp) {
@@ -245,7 +274,7 @@ progress through the three-part upload process.
     const force_ocr = form.get("force_ocr") === "on";
 
     ({ error } = await documents.process(
-      [{ id: document.id, force_ocr, ocr_engine: ocrEngine.value }],
+      [{ id: document?.id, force_ocr, ocr_engine: ocrEngine?.value }],
       csrf_token,
     ));
 
diff --git a/src/lib/components/forms/UploadListItem.svelte b/src/lib/components/forms/UploadListItem.svelte
index 18cf93878..7d8292355 100644
--- a/src/lib/components/forms/UploadListItem.svelte
+++ b/src/lib/components/forms/UploadListItem.svelte
@@ -59,8 +59,8 @@
 <!-- file is ready, uploading or processing -->
 <Flex align="baseline" gap={1} role="listitem" class="upload-list-item" {id}>
   <div class="title">
-    {#if linkable}
-      <a href={canonicalUrl(status.document).href}>{status.document.title}</a>
+    {#if linkable && status.document}
+      <a href={canonicalUrl(status.document).href}>{status.document?.title}</a>
     {:else}
       <Field inline sronly title={$_("common.title")} {description}>
         <Text
diff --git a/src/lib/utils/files.ts b/src/lib/utils/files.ts
index 89a159164..13d159b26 100644
--- a/src/lib/utils/files.ts
+++ b/src/lib/utils/files.ts
@@ -7,20 +7,21 @@ import {
 
 const types = new Set(DOCUMENT_TYPES);
 
-export function getFileExtensionFromType(filetype?: string) {
+export function getFileExtensionFromType(filetype?: string): string {
   if (filetype?.includes("/")) {
-    return filetype.split("/")[1];
+    return filetype.split("/")[1] ?? "";
   }
-  return filetype;
+  return filetype ?? "";
 }
 
-export function getFileExtension(file?: File): Maybe<string> {
-  if (!file) return;
+export function getFileExtension(file?: File): string {
+  if (!file) return "";
   if (file.name.includes(".")) {
-    return file.name.toLowerCase().trim().split(".").pop();
+    return file.name.toLowerCase().trim().split(".").pop() ?? "";
   } else if (file.type) {
-    return getFileExtensionFromType(file.type);
+    return getFileExtensionFromType(file.type) ?? "";
   }
+  return "";
 }
 
 export function isSupported(file: File): boolean {
diff --git a/src/lib/utils/tests/files.test.ts b/src/lib/utils/tests/files.test.ts
index 8d085b5f9..4c2858424 100644
--- a/src/lib/utils/tests/files.test.ts
+++ b/src/lib/utils/tests/files.test.ts
@@ -9,7 +9,7 @@ describe("files.getFileExtensionFromType", () => {
   it("returns the provided input if not a Mimetype", () => {
     expect(files.getFileExtensionFromType("")).toEqual("");
     expect(files.getFileExtensionFromType("pdf")).toEqual("pdf");
-    expect(files.getFileExtensionFromType(undefined)).toEqual(undefined);
+    expect(files.getFileExtensionFromType(undefined)).toEqual("");
   });
 });
 
@@ -33,7 +33,7 @@ describe("files.getFileExtension", () => {
 
   it("returns undefined if neither filename extension nor file type", () => {
     const file = new File([], "filename");
-    expect(files.getFileExtension(file)).toBeUndefined();
+    expect(files.getFileExtension(file)).toEqual("");
   });
 });
 
diff --git a/src/routes/(app)/upload/+page.server.ts b/src/routes/(app)/upload/+page.server.ts
deleted file mode 100644
index f7d0eb378..000000000
--- a/src/routes/(app)/upload/+page.server.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import type { Actions } from "./$types";
-
-import { fail } from "@sveltejs/kit";
-import { CSRF_COOKIE_NAME } from "@/config/config.js";
-import { upload } from "$lib/components/forms/DocumentUpload.svelte";
-
-export function load({ cookies }) {
-  const csrf_token = cookies.get(CSRF_COOKIE_NAME);
-  return { csrf_token };
-}
-
-export const actions = {
-  default: async ({ request, cookies, fetch }) => {
-    const csrf_token = cookies.get(CSRF_COOKIE_NAME);
-    if (!csrf_token) {
-      return fail(403, { message: "Missing CSRF token" });
-    }
-    const form = await request.formData();
-
-    return upload(form, csrf_token, null, fetch);
-  },
-} satisfies Actions;
diff --git a/src/routes/(app)/upload/+page.svelte b/src/routes/(app)/upload/+page.svelte
index 5a10fd197..04a73abe2 100644
--- a/src/routes/(app)/upload/+page.svelte
+++ b/src/routes/(app)/upload/+page.svelte
@@ -12,8 +12,7 @@
 
   export let data;
 
-  $: form = $page.form;
-  $: projects = data.projects.results;
+  $: projects = data.projects?.results ?? [];
 </script>
 
 <svelte:head>