diff --git a/src/routes/error_handlers.ts b/src/routes/error_handlers.ts
index 074bf0053..6a4ee714b 100644
--- a/src/routes/error_handlers.ts
+++ b/src/routes/error_handlers.ts
@@ -2,6 +2,7 @@ import type { Application, NextFunction, Request, Response } from "express";
 import log from "../services/log.js";
 import NotFoundError from "../errors/not_found_error.js";
 import ForbiddenError from "../errors/forbidden_error.js";
+import HttpError from "../errors/http_error.js";
 
 function register(app: Application) {
     app.use((err: any, req: Request, res: Response, next: NextFunction) => {
@@ -20,17 +21,19 @@ function register(app: Application) {
     });
 
     // error handler
-    app.use((err: any, req: Request, res: Response, _next: NextFunction) => {
-        if (err.status !== 404) {
-            log.info(err);
-        } else {
-            log.info(`${err.status} ${req.method} ${req.url}`);
-        }
+    app.use((err: unknown | Error, req: Request, res: Response, _next: NextFunction) => {
 
-        res.status(err.status || 500);
-        res.send({
-            message: err.message
+        const statusCode = (err instanceof HttpError) ? err.statusCode : 500;
+        const errMessage = (err instanceof Error && statusCode !== 404)
+            ? err
+            : `${statusCode} ${req.method} ${req.url}`;
+
+        log.info(errMessage);
+
+        res.status(statusCode).send({
+            message: err instanceof Error ? err.message : "Unknown Error"
         });
+
     });
 }