diff --git a/src/routes/(token-based)/+layout.server.ts b/src/routes/(token-based)/+layout.server.ts
index 42713ba..ea7d7f9 100644
--- a/src/routes/(token-based)/+layout.server.ts
+++ b/src/routes/(token-based)/+layout.server.ts
@@ -1,18 +1,18 @@
 import { vorgangPINValidation, vorgangExists } from '$lib/server/vorgangService';
 import { redirect } from '@sveltejs/kit';
-import type { PageServerLoad } from './list/[vorgang]/$types';
+import type { LayoutServerLoad } from './$types';
 import { ROUTE_NAMES } from '..';
 
-export const load: PageServerLoad = async ({ params, cookies, locals }) => {
+export const load: LayoutServerLoad = async ({ params, cookies, locals }) => {
 	if (locals.user) {
 		return {
 			user: locals.user
 		};
 	}
 
-	const vorgangToken = params.vorgang;
+	const vorgangToken = params.vorgang || '';
 	const COOKIE_NAME = `token-${vorgangToken}`;
-	const vorgangPIN = cookies.get(COOKIE_NAME);
+	const vorgangPIN = cookies.get(COOKIE_NAME) || '';
 
 	const isVorgangValid = vorgangExists(vorgangToken);
 	const isVorgangPINValid = vorgangPINValidation(vorgangToken, vorgangPIN);
diff --git a/tests/views/Anmeldung.test.ts b/tests/views/Anmeldung.test.ts
index f357c10..96cf9b3 100644
--- a/tests/views/Anmeldung.test.ts
+++ b/tests/views/Anmeldung.test.ts
@@ -6,6 +6,7 @@ import { baseData } from '../fixtures';
 import { ROUTE_NAMES } from '../../src/routes';
 import { dev } from '$app/environment';
 import { vorgangExists, vorgangPINValidation } from '$lib/server/vorgangService';
+import { Redirect } from '@sveltejs/kit';
 
 vi.mock('$lib/server/vorgangService', () => ({
 	vorgangExists: vi.fn(),
@@ -34,11 +35,11 @@ describe('Vorgang Anzeige via Token', () => {
       }
     };
 
-    let thrownRedirect;
+    let thrownRedirect: Redirect | undefined;
     try {
       await actions.getVorgangByToken(event);
     } catch (e) {
-      thrownRedirect = e;
+      thrownRedirect = e as Redirect;
     }
 
     // Redirect bei erfolgreicher Eingabe
diff --git a/vite.config.ts b/vite.config.ts
index c506829..ac7ee3b 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -8,7 +8,7 @@ export default defineConfig({
 	resolve: {
 		alias: {
 			$lib: path.resolve('./src/lib'),
-			$root: path.resolve(__dirname, 'src')
+			$root: path.resolve(__dirname, './src')
 		}
 	},
 	test: {