diff --git a/controllers/sites.js b/controllers/sites.js
index ea1487a..4c5fb24 100644
--- a/controllers/sites.js
+++ b/controllers/sites.js
@@ -4,9 +4,12 @@ module.exports = {
   // Find site by ID export
   findById: function(req, res){
     Site.findById(req.params.id, function(err, site){
-      if(err) throw err;
-      console.log("Site->Controller: findById queried: " + site.site);
-      res.render('site', { title: site.site, site: site });
+      // if(err) throw err;
+      if(err) res.render('index', { title: 'Site is not found!'});
+      else {
+        console.log("Site->Controller: findById queried: " + site.site);
+        res.render('site', { title: site.site, site: site });
+      }
     });
   }
 }
diff --git a/model/Site.js b/model/Site.js
index 3b95a8e..930e91a 100644
--- a/model/Site.js
+++ b/model/Site.js
@@ -19,8 +19,12 @@ Site.findById = function(id, callback){
 
   con.query(sql, id, function(err, result){
     if (err) return callback(err);
-    console.log("Site.findById: " + result[0].site + " retrieved!");
-    callback(err, new Site(result[0]));
+    // if not site is found.
+    if (result[0] == undefined) callback(404);
+    else {
+      console.log("Site.findById: " + result[0].site + " retrieved!");
+      callback(err, new Site(result[0]));
+    }
   });
 };