diff --git a/modules/BoundingDiameters/pom.xml b/modules/BoundingDiameters/pom.xml
index ef4902c68e..3d2bd8d28d 100644
--- a/modules/BoundingDiameters/pom.xml
+++ b/modules/BoundingDiameters/pom.xml
@@ -10,7 +10,7 @@
     
     <groupId>nl.liacs</groupId>
     <artifactId>boundingdiameters</artifactId>
-    <version>0.0.1</version>
+    <version>0.0.2</version>
     <packaging>nbm</packaging>
 
     <name>BoundingDiameters</name>
diff --git a/modules/BoundingDiameters/src/main/java/nl/liacs/boundingdiameters/DiameterMetric.java b/modules/BoundingDiameters/src/main/java/nl/liacs/boundingdiameters/DiameterMetric.java
index 9c14d96781..cbd428683a 100644
--- a/modules/BoundingDiameters/src/main/java/nl/liacs/boundingdiameters/DiameterMetric.java
+++ b/modules/BoundingDiameters/src/main/java/nl/liacs/boundingdiameters/DiameterMetric.java
@@ -83,6 +83,15 @@ public void execute(GraphModel graphModel) {
         
         Graph graph = graphModel.getUndirectedGraph();
 
+        if (graph.getNodeCount() == 0) {
+            // No component to look for the giant one in, the report is built from empty results
+            eccLower = new int[0];
+            diameter = 0;
+            radius = 0;
+            peripherySize = 0;
+            centerSize = 0;
+            return;
+        }
         
         initializeStartValues(graph);