diff --git a/varken/influxdb2manager.py b/varken/influxdb2manager.py
index 0cb9df9..3979ba4 100644
--- a/varken/influxdb2manager.py
+++ b/varken/influxdb2manager.py
@@ -1,8 +1,7 @@
 from sys import exit
 from logging import getLogger
-from requests.exceptions import ConnectionError
 import influxdb_client
-from influxdb_client import InfluxDBClient, Point
+from influxdb_client import InfluxDBClient
 from influxdb_client.client.write_api import SYNCHRONOUS
 
 
@@ -15,7 +14,8 @@ class InfluxDB2Manager(object):
             exit()
 
         self.influx = InfluxDBClient(url=self.server.url, token=self.server.token, org=self.server.org,
-                                    timeout=self.server.timeout, verify_ssl=self.server.verify_ssl, ssl_ca_cert=self.server.ssl)
+                                     timeout=self.server.timeout, verify_ssl=self.server.verify_ssl,
+                                     ssl_ca_cert=self.server.ssl)
         self.influx_write_api = self.influx.write_api(write_options=SYNCHRONOUS)
 
         # Create the bucket if needed
@@ -41,6 +41,6 @@ class InfluxDB2Manager(object):
 
         try:
             self.influx_write_api.write(bucket=self.server.bucket, record=d)
-        except (InfluxDBServerError, ConnectionError) as e:
+        except Exception as e:
             self.logger.error('Error writing data to influxdb2. Dropping this set of data. '
                               'Check your database! Error: %s', e)
diff --git a/varken/iniparser.py b/varken/iniparser.py
index 7e9f9ab..c00174c 100644
--- a/varken/iniparser.py
+++ b/varken/iniparser.py
@@ -146,12 +146,14 @@ class INIParser(object):
             self.config_blacklist()
 
         # Parse InfluxDB options
-        self.influx2_enabled = env.get('VRKN_GLOBAL_INFLUXDB2_ENABLED', self.config.getboolean('global', 'influx2_enabled'))
-        
+        self.influx2_enabled = env.get('VRKN_GLOBAL_INFLUXDB2_ENABLED',
+                                       self.config.getboolean('global', 'influx2_enabled'))
+
         if self.influx2_enabled:
             # Use INFLUX version 2
             try:
-                url = self.url_check(env.get('VRKN_INFLUXDB2_URL', self.config.get('influx2', 'url')), section='influx2')
+                url = self.url_check(env.get('VRKN_INFLUXDB2_URL', self.config.get('influx2', 'url')),
+                                     section='influx2')
                 ssl = boolcheck(env.get('VRKN_INFLUXDB2_SSL', self.config.get('influx2', 'ssl')))
                 verify_ssl = boolcheck(env.get('VRKN_INFLUXDB2_VERIFY_SSL', self.config.get('influx2', 'verify_ssl')))
 
@@ -164,11 +166,11 @@ class INIParser(object):
                 return
 
             self.influx_server = Influx2Server(url=url, token=token, org=org, timeout=timeout, ssl=ssl,
-                                            verify_ssl=verify_ssl)
+                                               verify_ssl=verify_ssl)
         else:
             try:
                 url = self.url_check(env.get('VRKN_INFLUXDB_URL', self.config.get('influxdb', 'url')),
-                                    include_port=False, section='influxdb')
+                                     include_port=False, section='influxdb')
                 port = int(env.get('VRKN_INFLUXDB_PORT', self.config.getint('influxdb', 'port')))
                 ssl = boolcheck(env.get('VRKN_INFLUXDB_SSL', self.config.get('influxdb', 'ssl')))
                 verify_ssl = boolcheck(env.get('VRKN_INFLUXDB_VERIFY_SSL', self.config.get('influxdb', 'verify_ssl')))
@@ -181,7 +183,7 @@ class INIParser(object):
                 return
 
             self.influx_server = InfluxServer(url=url, port=port, username=username, password=password, ssl=ssl,
-                                            verify_ssl=verify_ssl)
+                                              verify_ssl=verify_ssl)
 
         # Check for all enabled services
         for service in self.services: