Merge branch 'master' of https://github.com/discord-open-source/discord-api

1 files changed, 3 insertions, 2 deletions

diff --git a/src/middlewares/ErrorHandler.ts b/src/middlewares/ErrorHandler.ts

index 52fa949c..25a68865 100644
--- a/src/middlewares/ErrorHandler.ts
+++ b/src/middlewares/ErrorHandler.ts
@@ -16,14 +16,15 @@ export function ErrorHandler(error: Error, req: Request, res: Response, next: Ne
 			errors = error.errors;
 		} else {
 			console.error(error);
-			if (req.server.options.production) {
+			if (req.server?.options?.production) {
 				message = "Internal Server Error";
 			}
 			code = httpcode = 500;
 		}
 
 		res.status(httpcode).json({ code: code, message, errors });
-		return next();
+
+		return;
 	} catch (error) {
 		console.error(error);
 		return res.status(500).json({ code: 500, message: "Internal Server Error" });