diff --git a/backend/config/express.js b/backend/config/express.js
index 67854bc..d885f08 100644
--- a/backend/config/express.js
+++ b/backend/config/express.js
@@ -42,7 +42,7 @@ module.exports = function(app) {
 	        res.setHeader('Access-Control-Allow-Origin', origin);
 	    } else if (req.headers["user-agent"] == 'TrunkRecorder1.0') {
 	        res.setHeader('Access-Control-Allow-Origin', "*");
-	    } else if (origin.indexOf(".vercel.app") > -1) {
+	    } else if (origin &&origin.indexOf(".vercel.app") > -1) {
 			next("Scraper!! ☠️ " + origin);
 		} else {
 	        res.setHeader('Access-Control-Allow-Origin', "*");
diff --git a/backend/index.js b/backend/index.js
index cb67f42..d83cd04 100644
--- a/backend/index.js
+++ b/backend/index.js
@@ -193,15 +193,9 @@ function get_clients(req, res) {
 app.get('/clients', get_clients);
 app.get('/:shortName/clients', get_clients);
 app.use(function (err, req, res, next) {
-  console.error("Caught an error");
-  console.error(err.stack);
-  /*
+
   res.status(err.status || 500);
-  res.contentType('json');
-  res.send(JSON.stringify({
-      message: err.message,
-      error: err
-  }));*/
+  res.send(err.message);
 });