diff --git a/sites/svelte.dev/src/lib/server/tutorial/index.js b/sites/svelte.dev/src/lib/server/tutorial/index.js
index 04c33bf507..2da22f7659 100644
--- a/sites/svelte.dev/src/lib/server/tutorial/index.js
+++ b/sites/svelte.dev/src/lib/server/tutorial/index.js
@@ -21,7 +21,7 @@ const languages = {
 export async function get_parsed_tutorial(tutorial_data, slug) {
 	const tutorial = tutorial_data
 		.find(({ tutorials }) => tutorials.find((t) => t.slug === slug))
-		.tutorials.find((t) => t.slug === slug);
+		?.tutorials?.find((t) => t.slug === slug);
 
 	if (!tutorial) return null;
 
diff --git a/sites/svelte.dev/src/routes/tutorial/[slug]/+page.server.js b/sites/svelte.dev/src/routes/tutorial/[slug]/+page.server.js
index be8315a379..fb437a5e30 100644
--- a/sites/svelte.dev/src/routes/tutorial/[slug]/+page.server.js
+++ b/sites/svelte.dev/src/routes/tutorial/[slug]/+page.server.js
@@ -1,20 +1,18 @@
 import { get_parsed_tutorial } from '$lib/server/tutorial';
 import { get_tutorial_data, get_tutorial_list } from '$lib/server/tutorial/get-tutorial-data';
 import { error } from '@sveltejs/kit';
-import fs from 'fs';
-
-const base = '../../site/content/tutorial/';
 
 export async function load({ params }) {
 	const tutorial_data = get_tutorial_data();
 	const tutorials_list = get_tutorial_list(tutorial_data);
 
-	const tutorial = get_parsed_tutorial(tutorial_data, params.slug);
+	const tutorial = await get_parsed_tutorial(tutorial_data, params.slug);
+
+	if (!tutorial) throw error(404);
 
 	return {
 		tutorials_list,
 		tutorial,
 		slug: params.slug,
 	};
-	// throw error(404);
 }