diff --git a/public-api/src/main.mjs b/public-api/src/main.mjs
index 49357f8..da2cbf9 100644
--- a/public-api/src/main.mjs
+++ b/public-api/src/main.mjs
@@ -2,12 +2,17 @@ import * as env from "./env.mjs";
 
 export default {
     fetch: async function (request, _env) {
-        console.log("Incoming request!");
-        env.configure(_env);
+        try {
+            console.log("Incoming request!");
+            env.configure(_env);
 
-        console.log("Handling request...");
+            console.log("Handling request...");
 
-        const router = (await import("./routes/index.mjs")).default;
-        return await router.handle(request, env);
+            const router = (await import("./routes/index.mjs")).default;
+            return await router.handle(request, env);
+        } catch (e) {
+            console.error("Internal error:", e.toString(), e.stack);
+            return new Response("Internal Error.");
+        }
     },
 };