diff --git a/Server/controllers/maintenanceWindowController.js b/Server/controllers/maintenanceWindowController.js
index d94746fe3..41b160fe2 100644
--- a/Server/controllers/maintenanceWindowController.js
+++ b/Server/controllers/maintenanceWindowController.js
@@ -15,9 +15,9 @@ const createMaintenanceWindow = async (req, res, next) => {
   } catch (error) {
     error.status = 422;
     error.service = SERVICE_NAME;
-    error.message = error.details[0].message;
+    error.message =
+      error.details?.[0]?.message || error.message || "Validation Error";
     next(error);
-    return;
   }
 
   try {
@@ -48,7 +48,14 @@ const getMaintenanceWindowsByUserId = async (req, res, next) => {
     await getMaintenanceWindowsByUserIdParamValidation.validateAsync(
       req.params
     );
-
+  } catch (error) {
+    error.status = 422;
+    error.service = SERVICE_NAME;
+    error.message =
+      error.details?.[0]?.message || error.message || "Validation Error";
+    next(error);
+  }
+  try {
     const maintenanceWindows = await req.db.getMaintenanceWindowsByUserId(
       req.params.userId
     );
@@ -69,7 +76,15 @@ const getMaintenanceWindowsByMonitorId = async (req, res, next) => {
     await getMaintenanceWindowsByMonitorIdParamValidation.validateAsync(
       req.params
     );
+  } catch (error) {
+    error.status = 422;
+    error.service = SERVICE_NAME;
+    error.message =
+      error.details?.[0]?.message || error.message || "Validation Error";
+    next(error);
+  }
 
+  try {
     const maintenanceWindows = await req.db.getMaintenanceWindowsByMonitorId(
       req.params.monitorId
     );