diff --git a/deno.json b/deno.json
index 8b05212..3d68252 100644
--- a/deno.json
+++ b/deno.json
@@ -1,7 +1,7 @@
 {
 	"name": "@andyburke/serverus",
 	"description": "A flexible HTTP server for mixed content. Throw static files, markdown, Typescript and (hopefully, eventually) more into a directory and serverus can serve it up a bit more like old-school CGI.",
-	"version": "0.14.1",
+	"version": "0.14.2",
 	"license": "MIT",
 	"exports": {
 		".": "./serverus.ts",
diff --git a/handlers/spa.ts b/handlers/spa.ts
index fa82343..2f44895 100644
--- a/handlers/spa.ts
+++ b/handlers/spa.ts
@@ -13,11 +13,7 @@ async function find_spa_file_root(request_path: string): Promise<string | undefi
 	const relative_path = path.relative(current_path, request_path);
 	const path_elements = relative_path.split('/').slice(0, -1);
 
-	let element;
-
-	while ((element = path_elements.shift())) {
-		current_path = path.join(current_path, element);
-
+	do {
 		try {
 			const spa_file_stat = await Deno.stat(path.join(current_path, '.spa'));
 
@@ -25,13 +21,13 @@ async function find_spa_file_root(request_path: string): Promise<string | undefi
 				return current_path;
 			}
 		} catch (error) {
-			if (error instanceof Deno.errors.NotFound) {
-				continue;
+			if (!(error instanceof Deno.errors.NotFound)) {
+				throw error;
 			}
-
-			throw error;
 		}
-	}
+
+		current_path = path.join(current_path, path_elements.shift() ?? '');
+	} while (path_elements.length);
 
 	return undefined;
 }
diff --git a/tests/11_test_spa.test.ts b/tests/11_test_spa.test.ts
index b57a8ff..b569dab 100644
--- a/tests/11_test_spa.test.ts
+++ b/tests/11_test_spa.test.ts
@@ -14,11 +14,11 @@ Deno.test({
 		const cwd = Deno.cwd();
 
 		try {
-			Deno.chdir('./tests/www');
+			Deno.chdir('./tests/www/spa');
 			test_server_info = await get_ephemeral_listen_server();
 
 			{
-				const response = await fetch(`http://${test_server_info.hostname}:${test_server_info.port}/spa/foo/bar/baz`, {
+				const response = await fetch(`http://${test_server_info.hostname}:${test_server_info.port}/foo/bar/baz`, {
 					method: 'GET'
 				});
 
@@ -30,7 +30,7 @@ Deno.test({
 			}
 
 			{
-				const response = await fetch(`http://${test_server_info.hostname}:${test_server_info.port}/spa/testing`, {
+				const response = await fetch(`http://${test_server_info.hostname}:${test_server_info.port}/testing`, {
 					method: 'GET'
 				});
 
@@ -42,7 +42,7 @@ Deno.test({
 			}
 
 			{
-				const response = await fetch(`http://${test_server_info.hostname}:${test_server_info.port}/spa/testing/blah.html`, {
+				const response = await fetch(`http://${test_server_info.hostname}:${test_server_info.port}/testing/blah.html`, {
 					method: 'GET'
 				});