diff --git a/src/helper/influx-checks.js b/src/helper/influx-checks.js
index f1858f9..857332e 100644
--- a/src/helper/influx-checks.js
+++ b/src/helper/influx-checks.js
@@ -8,9 +8,9 @@ function checkHealth(influxDb){
         new Influx.HealthAPI(influxDb)    // Check influx health
             .getHealth()
             .catch((err) => {
-                logger.fatal("Could not communicate with Influx:");
-                logger.fatal(`Error [${err.code}]:`, err.message);
-                reject(err);
+                logger.error("Could not communicate with Influx:");
+                logger.error(`Error [${err.code}]:`, err.message);
+                reject();
             })
             .then((res) => {
                 logger.debug("Server healthy.", "Version: ", res.version);
@@ -23,9 +23,9 @@ function checkBucket(influxDb, options){
     return new Promise((resolve, reject) => {
         new Influx.BucketsAPI(influxDb).getBuckets(options)
             .catch((err) => {       // Weirdly the influx-Api returns 404 for searches of non-existing buckets
-                logger.fatal("Could not get bucket:");
-                logger.fatal(`Error [${err.code}]:`, err.message);
-                reject(err);
+                logger.error("Could not get bucket:");
+                logger.error(`Error [${err.code}]:`, err.message);
+                reject();
             }).then((res) => {      // But an empty list when the bucket exists, but token does not have permission to get details
                 logger.debug("Bucket found");
                 resolve(res);
diff --git a/src/main.js b/src/main.js
index 47a8a18..0eb1fac 100644
--- a/src/main.js
+++ b/src/main.js
@@ -31,7 +31,13 @@ if(errorMsg){
       org: env.INFLUX_ORG,
       name: env.INFLUX_BUCKET
     })})
-    .then((res) => {})
-    .catch(exit(1));
+    .catch((err) => {
+      if(err) {
+        logger.error("Error whilst checking influx:");
+        logger.error(err);
+      }
+      logger.fatal("Setup influx failed!");
+      exit(1);
+    });
 
 })();