diff --git a/functions/_middleware.js b/functions/_middleware.js
deleted file mode 100644
index b7f8e65d..00000000
--- a/functions/_middleware.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import { errorHandling, telemetryData, checkKVConfig } from './utils/middleware';
-
-export const onRequest = [checkKVConfig, errorHandling, telemetryData];
\ No newline at end of file
diff --git a/functions/api/_middleware.js b/functions/api/_middleware.js
new file mode 100644
index 00000000..40653994
--- /dev/null
+++ b/functions/api/_middleware.js
@@ -0,0 +1,3 @@
+import { checkKVConfig } from '../utils/middleware';
+
+export const onRequest = [checkKVConfig];
\ No newline at end of file
diff --git a/functions/api/manage/_middleware.js b/functions/api/manage/_middleware.js
index 68e1acf6..d01ffa1d 100644
--- a/functions/api/manage/_middleware.js
+++ b/functions/api/manage/_middleware.js
@@ -1,11 +1,19 @@
 import { fetchSecurityConfig } from "../../utils/sysConfig";
-import { checkKVConfig, errorHandling } from "../../utils/middleware";
+import { checkKVConfig } from "../../utils/middleware";
 import { validateApiToken } from "../../utils/tokenValidator";
 
 let securityConfig = {}
 let basicUser = ""
 let basicPass = ""
 
+async function errorHandling(context) {
+  try {
+    return await context.next();
+  } catch (err) {
+    return new Response(`${err.message}\n${err.stack}`, { status: 500 });
+  }
+}
+
 function basicAuthentication(request) {
   const Authorization = request.headers.get('Authorization');
 
diff --git a/functions/file/_middleware.js b/functions/file/_middleware.js
new file mode 100644
index 00000000..40653994
--- /dev/null
+++ b/functions/file/_middleware.js
@@ -0,0 +1,3 @@
+import { checkKVConfig } from '../utils/middleware';
+
+export const onRequest = [checkKVConfig];
\ No newline at end of file
diff --git a/functions/random/_middleware.js b/functions/random/_middleware.js
new file mode 100644
index 00000000..40653994
--- /dev/null
+++ b/functions/random/_middleware.js
@@ -0,0 +1,3 @@
+import { checkKVConfig } from '../utils/middleware';
+
+export const onRequest = [checkKVConfig];
\ No newline at end of file
diff --git a/functions/random.js b/functions/random/index.js
similarity index 97%
rename from functions/random.js
rename to functions/random/index.js
index 1650cdab..29eef188 100644
--- a/functions/random.js
+++ b/functions/random/index.js
@@ -1,5 +1,5 @@
-import { fetchOthersConfig } from "./utils/sysConfig";
-import { readIndex } from "./utils/indexManager";
+import { fetchOthersConfig } from "../utils/sysConfig";
+import { readIndex } from "../utils/indexManager";
 
 let othersConfig = {};
 let allowRandom = false;
diff --git a/functions/upload/_middleware.js b/functions/upload/_middleware.js
new file mode 100644
index 00000000..090c6661
--- /dev/null
+++ b/functions/upload/_middleware.js
@@ -0,0 +1,3 @@
+import { errorHandling, telemetryData, checkKVConfig } from '../utils/middleware';
+
+export const onRequest = [checkKVConfig, errorHandling, telemetryData];
\ No newline at end of file
diff --git a/functions/utils/middleware.js b/functions/utils/middleware.js
index 6a744096..41173b4e 100644
--- a/functions/utils/middleware.js
+++ b/functions/utils/middleware.js
@@ -1,7 +1,6 @@
 import sentryPlugin from "@cloudflare/pages-plugin-sentry";
 import '@sentry/tracing';
 import { fetchOthersConfig } from "./sysConfig";
-import { getIndexInfo, rebuildIndex } from "./indexManager";
 
 let disableTelemetry = false;