diff --git a/gradle.properties b/gradle.properties
index 52cb716..ec5983c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,3 @@
 id            = hmci
 group         = biz.nellemann.hmci
-version       = 0.2.2
+version       = 0.2.3
diff --git a/src/main/java/biz/nellemann/hmci/Insights.java b/src/main/java/biz/nellemann/hmci/Insights.java
index 624ec76..bc472ac 100644
--- a/src/main/java/biz/nellemann/hmci/Insights.java
+++ b/src/main/java/biz/nellemann/hmci/Insights.java
@@ -152,12 +152,20 @@ class Insights {
 
 
     void writeMetricsForManagedSystems() {
-        systems.forEach((systemId, system) -> influxClient.writeManagedSystem(system));
+        try {
+            systems.forEach((systemId, system) -> influxClient.writeManagedSystem(system));
+        } catch (NullPointerException npe) {
+            log.warn("writeMetricsForManagedSystems() - NPE: " + npe.toString());
+        }
     }
 
 
     void writeMetricsForLogicalPartitions() {
-        partitions.forEach((partitionId, partition) -> influxClient.writeLogicalPartition(partition));
+        try {
+            partitions.forEach((partitionId, partition) -> influxClient.writeLogicalPartition(partition));
+        } catch (NullPointerException npe) {
+            log.warn("writeMetricsForLogicalPartitions() - NPE: " + npe.toString());
+        }
     }
 
 
@@ -174,7 +182,6 @@ class Insights {
         Runtime.getRuntime().addShutdownHook(shutdownHook);
 
         do {
-
             try {
                 getMetricsForSystems();
                 getMetricsForPartitions();