diff --git a/metricsaggregator/src/main/java/io/dockstore/metricsaggregator/DoubleStatistics.java b/metricsaggregator/src/main/java/io/dockstore/metricsaggregator/DoubleStatistics.java
index f2f59d02..a5604573 100644
--- a/metricsaggregator/src/main/java/io/dockstore/metricsaggregator/DoubleStatistics.java
+++ b/metricsaggregator/src/main/java/io/dockstore/metricsaggregator/DoubleStatistics.java
@@ -74,7 +74,7 @@ public static DoubleStatistics createFromStatistics(List<DoubleStatistics> stati
      */
     @Override
     public Double calculateMinimum(List<Double> dataPoints) {
-        return dataPoints.stream().mapToDouble(d -> d).min().getAsDouble();
+        return dataPoints.stream().mapToDouble(d -> d).min().orElse(0);
     }
 
     /**
@@ -84,7 +84,7 @@ public Double calculateMinimum(List<Double> dataPoints) {
      */
     @Override
     public Double calculateMaximum(List<Double> dataPoints) {
-        return dataPoints.stream().mapToDouble(d -> d).max().getAsDouble();
+        return dataPoints.stream().mapToDouble(d -> d).max().orElse(0);
     }
 
     /**
@@ -94,7 +94,7 @@ public Double calculateMaximum(List<Double> dataPoints) {
      */
     @Override
     public Double calculateAverage(List<Double> dataPoints) {
-        return dataPoints.stream().mapToDouble(d -> d).average().getAsDouble();
+        return dataPoints.stream().mapToDouble(d -> d).average().orElse(0);
     }
 
     /**
diff --git a/metricsaggregator/src/main/java/io/dockstore/metricsaggregator/MoneyStatistics.java b/metricsaggregator/src/main/java/io/dockstore/metricsaggregator/MoneyStatistics.java
index a4f48cd6..87102583 100644
--- a/metricsaggregator/src/main/java/io/dockstore/metricsaggregator/MoneyStatistics.java
+++ b/metricsaggregator/src/main/java/io/dockstore/metricsaggregator/MoneyStatistics.java
@@ -48,7 +48,7 @@ public static MoneyStatistics createFromStatistics(List<MoneyStatistics> statist
     public Money calculateMinimum(List<Money> dataPoints) {
         return dataPoints.stream()
                 .min(Money::compareTo)
-                .get();
+                .orElse(Money.of(0, currency));
     }
 
     /**
@@ -60,7 +60,7 @@ public Money calculateMinimum(List<Money> dataPoints) {
     public Money calculateMaximum(List<Money> dataPoints) {
         return dataPoints.stream()
                 .max(Money::compareTo)
-                .get();
+                .orElse(Money.of(0, currency));
     }
 
     /**