diff --git a/Server/controllers/checkController.js b/Server/controllers/checkController.js
index 3379f5d17..f3c85352f 100644
--- a/Server/controllers/checkController.js
+++ b/Server/controllers/checkController.js
@@ -17,6 +17,7 @@ const createCheck = async (req, res, next) => {
     error.message =
       error.details?.[0]?.message || error.message || "Validation Error";
     next(error);
+    return;
   }
 
   try {
@@ -40,6 +41,7 @@ const getChecks = async (req, res, next) => {
     error.message =
       error.details?.[0]?.message || error.message || "Validation Error";
     next(error);
+    return;
   }
 
   try {
@@ -62,6 +64,7 @@ const deleteChecks = async (req, res, next) => {
     error.message =
       error.details?.[0]?.message || error.message || "Validation Error";
     next(error);
+    return;
   }
 
   try {
diff --git a/Server/controllers/maintenanceWindowController.js b/Server/controllers/maintenanceWindowController.js
index 41b160fe2..5fe8ab7db 100644
--- a/Server/controllers/maintenanceWindowController.js
+++ b/Server/controllers/maintenanceWindowController.js
@@ -18,6 +18,7 @@ const createMaintenanceWindow = async (req, res, next) => {
     error.message =
       error.details?.[0]?.message || error.message || "Validation Error";
     next(error);
+    return;
   }
 
   try {
@@ -54,6 +55,7 @@ const getMaintenanceWindowsByUserId = async (req, res, next) => {
     error.message =
       error.details?.[0]?.message || error.message || "Validation Error";
     next(error);
+    return;
   }
   try {
     const maintenanceWindows = await req.db.getMaintenanceWindowsByUserId(
@@ -82,6 +84,7 @@ const getMaintenanceWindowsByMonitorId = async (req, res, next) => {
     error.message =
       error.details?.[0]?.message || error.message || "Validation Error";
     next(error);
+    return;
   }
 
   try {
diff --git a/Server/controllers/pageSpeedCheckController.js b/Server/controllers/pageSpeedCheckController.js
index 7cc8696fc..eb290ad6e 100644
--- a/Server/controllers/pageSpeedCheckController.js
+++ b/Server/controllers/pageSpeedCheckController.js
@@ -1,4 +1,3 @@
-const PageSpeedCheck = require("../models/PageSpeedCheck");
 const PageSpeedService = require("../service/pageSpeedService");
 const { successMessages } = require("../utils/messages");
 const pageSpeedService = new PageSpeedService();
@@ -22,12 +21,19 @@ const getPageSpeedChecks = async (req, res, next) => {
   try {
     // Validate monitorId parameter
     await getPageSpeedCheckParamValidation.validateAsync(req.params);
+  } catch (error) {
+    error.status = 422;
+    error.service = SERVICE_NAME;
+    error.message =
+      error.details?.[0]?.message || error.message || "Validation Error";
+    next(error);
+    return;
+  }
 
+  try {
     return res.status(200).json({ msg: "Hit getPageSpeedChecks" });
   } catch (error) {
-    if (error.isJoi) {
-      return res.status(400).json({ error: error.details[0].message });
-    }
+    error.service = SERVICE_NAME;
     next(error);
   }
 };
@@ -42,12 +48,18 @@ const getPageSpeedChecks = async (req, res, next) => {
  */
 const createPageSpeedCheck = async (req, res, next) => {
   try {
-    // Validate monitorId parameter
     await createPageSpeedCheckParamValidation.validateAsync(req.params);
-
-    // Validate request body
     await createPageSpeedCheckBodyValidation.validateAsync(req.body);
+  } catch (error) {
+    error.status = 422;
+    error.service = SERVICE_NAME;
+    error.message =
+      error.details?.[0]?.message || error.message || "Validation Error";
+    next(error);
+    return;
+  }
 
+  try {
     const { monitorId } = req.params;
     const { url } = req.body;
 
@@ -74,9 +86,6 @@ const createPageSpeedCheck = async (req, res, next) => {
       data: newPageSpeedCheck,
     });
   } catch (error) {
-    if (error.isJoi) {
-      return res.status(400).json({ error: error.details[0].message });
-    }
     error.service = SERVICE_NAME;
     next(error);
   }
@@ -94,12 +103,17 @@ const deletePageSpeedCheck = async (req, res, next) => {
   try {
     // Validate monitorId parameter
     await deletePageSpeedCheckParamValidation.validateAsync(req.params);
-
+  } catch (error) {
+    error.status = 422;
+    error.service = SERVICE_NAME;
+    error.message =
+      error.details?.[0]?.message || error.message || "Validation Error";
+    next(error);
+    return;
+  }
+  try {
     return res.status(200).json({ msg: "Hit deletePageSpeedCheck" });
   } catch (error) {
-    if (error.isJoi) {
-      return res.status(400).json({ error: error.details[0].message });
-    }
     error.service = SERVICE_NAME;
     next(error);
   }