1 files changed, 3 insertions, 0 deletions
diff --git a/simplemetrics/src/main/java/com/yahoo/metrics/simple/jdisc/SnapshotConverter.java b/simplemetrics/src/main/java/com/yahoo/metrics/simple/jdisc/SnapshotConverter.java
index 83b84abaded..bb0989ae127 100644
--- a/simplemetrics/src/main/java/com/yahoo/metrics/simple/jdisc/SnapshotConverter.java
+++ b/simplemetrics/src/main/java/com/yahoo/metrics/simple/jdisc/SnapshotConverter.java
@@ -94,6 +94,9 @@ class SnapshotConverter {
     }
 
     private Map<String, MetricValue> getMap(Point point) {
+        if (point == null) {
+            point = new Point(new HashMap<>());
+        }
         if (! perPointData.containsKey(point)) {
             perPointData.put(point, new HashMap<>());
         }