diff --git a/lib/performance_test.rb b/lib/performance_test.rb
index d3c68db9b..54e8fd740 100644
--- a/lib/performance_test.rb
+++ b/lib/performance_test.rb
@@ -163,8 +163,10 @@ def fill_feeder_json(json)
       result.add_metric('feeder.minlatency', json['http.response.latency.millis.min'].to_s)
       result.add_metric('feeder.maxlatency', json['http.response.latency.millis.max'].to_s)
       result.add_metric('feeder.avglatency', json['http.response.latency.millis.avg'].to_s)
-      result.add_metric("feeder.operation.avg_latency", json.dig("operation.latency", "avg").to_s)
-      result.add_metric('feeder.response.200.avg_latency', json.dig("http.response", "200", "latency", "avg").to_s)
+      operation_latency = json.dig("operation.latency", "avg")
+      result.add_metric("feeder.operation.avg_latency", operation_latency.to_s) if operation_latency
+      response_200_latency = json.dig("http.response", "200", "latency", "avg")
+      result.add_metric('feeder.response.200.avg_latency', response_200_latency.to_s) if response_200_latency
       result.add_parameter('loadgiver', 'vespa-feed-client')
     end
   end