diff --git a/app/controllers/redirect.js b/app/controllers/redirect.js
index 49ea271..9975ab2 100644
--- a/app/controllers/redirect.js
+++ b/app/controllers/redirect.js
@@ -1,16 +1,5 @@
 const { getRealEstateById } = require("../helpers/db/realEstate");
 
-const redirect = async (req, res) => {
-  const id = req.params["id"];
-  const marketAlert = await getRealEstateById(id);
-  if (marketAlert) {
-    res.redirect(marketAlert.url);
-  } else {
-    res.send("Not found");
-    res.end();
-  }
-};
-
 const getRedirect = async (req, res) => {
   const id = req.params.id || null;
   let error = false;
@@ -18,11 +7,15 @@ const getRedirect = async (req, res) => {
   if (!id) {
     error = true;
   } else {
-    const realEstate = await getRealEstateById(id);
-    if (!realEstate) {
+    try {
+      const realEstate = await getRealEstateById(id);
+      if (!realEstate) {
+        error = true;
+      } else {
+        redirectUrl = realEstate.url;
+      }
+    } catch (e) {
       error = true;
-    } else {
-      redirectUrl = realEstate.url;
     }
   }
 
diff --git a/app/controllers/unsubscribe.js b/app/controllers/unsubscribe.js
index a6c400f..95b39b2 100644
--- a/app/controllers/unsubscribe.js
+++ b/app/controllers/unsubscribe.js
@@ -3,6 +3,12 @@ const { currentSearchRequest } = require("../helpers/url");
 const getUnsubscribe = async (req, res) => {
   const title = "Uspješno ste se odjavili";
   const searchRequest = await currentSearchRequest(req);
+
+  if (!searchRequest || !searchRequest.dataValues) {
+    res.render("notFound", { title: " " });
+    return;
+  }
+
   searchRequest.subscribed = false;
   await searchRequest.save();