diff --git a/Server/db/mongo/modules/monitorModule.js b/Server/db/mongo/modules/monitorModule.js
index eebb8f496..79e8917ea 100644
--- a/Server/db/mongo/modules/monitorModule.js
+++ b/Server/db/mongo/modules/monitorModule.js
@@ -280,6 +280,9 @@ const getMonitorStatsById = async (req) => {
 const getMonitorById = async (monitorId) => {
   try {
     const monitor = await Monitor.findById(monitorId);
+    if (monitor === null || monitor === undefined) {
+      throw new Error(errorMessages.DB_FIND_MONTIOR_BY_ID(monitorId));
+    }
     // Get notifications
     const notifications = await Notification.find({
       monitorId: monitorId,
diff --git a/Server/index.js b/Server/index.js
index 846b11e3d..47b7cfd90 100644
--- a/Server/index.js
+++ b/Server/index.js
@@ -140,9 +140,9 @@ const startApp = async () => {
     }
     process.exit(0);
   };
-  process.on("SIGUSR2", cleanup);
-  process.on("SIGINT", cleanup);
-  process.on("SIGTERM", cleanup);
+  // process.on("SIGUSR2", cleanup);
+  // process.on("SIGINT", cleanup);
+  // process.on("SIGTERM", cleanup);
 };
 
 startApp().catch((error) => {
diff --git a/Server/service/networkService.js b/Server/service/networkService.js
index 4f76194ac..f5c333a60 100644
--- a/Server/service/networkService.js
+++ b/Server/service/networkService.js
@@ -16,37 +16,45 @@ class NetworkService {
   }
 
   async handleNotification(job, isAlive) {
-    const { _id } = job.data;
-    const monitor = await this.db.getMonitorById(_id);
-    if (monitor === null || monitor === undefined) {
-      logger.error(`Null Monitor: ${_id}`, {
+    try {
+      const { _id } = job.data;
+      const monitor = await this.db.getMonitorById(_id);
+      if (monitor === null || monitor === undefined) {
+        logger.error(`Null Monitor: ${_id}`, {
+          method: "handleNotification",
+          service: this.SERVICE_NAME,
+          jobId: job.id,
+        });
+        return;
+      }
+
+      // If monitor status changes, update monitor status and send notification
+      if (monitor.status !== isAlive) {
+        monitor.status = !monitor.status;
+        await monitor.save();
+
+        let template =
+          isAlive === true ? "serverIsUpTemplate" : "serverIsDownTemplate";
+        let status = isAlive === true ? "up" : "down";
+
+        const notifications = await this.db.getNotificationsByMonitorId(_id);
+        for (const notification of notifications) {
+          if (notification.type === "email") {
+            await this.emailService.buildAndSendEmail(
+              template,
+              { monitorName: monitor.name, monitorUrl: monitor.url },
+              notification.address,
+              `Monitor ${monitor.name} is ${status}`
+            );
+          }
+        }
+      }
+    } catch (error) {
+      logger.error(error.message, {
         method: "handleNotification",
         service: this.SERVICE_NAME,
         jobId: job.id,
       });
-      return;
-    }
-
-    // If monitor status changes, update monitor status and send notification
-    if (monitor.status !== isAlive) {
-      monitor.status = !monitor.status;
-      await monitor.save();
-
-      let template =
-        isAlive === true ? "serverIsUpTemplate" : "serverIsDownTemplate";
-      let status = isAlive === true ? "up" : "down";
-
-      const notifications = await this.db.getNotificationsByMonitorId(_id);
-      for (const notification of notifications) {
-        if (notification.type === "email") {
-          await this.emailService.buildAndSendEmail(
-            template,
-            { monitorName: monitor.name, monitorUrl: monitor.url },
-            notification.address,
-            `Monitor ${monitor.name} is ${status}`
-          );
-        }
-      }
     }
   }