diff --git a/app/src/main/java/net/pokeranalytics/android/calculus/Calculator.kt b/app/src/main/java/net/pokeranalytics/android/calculus/Calculator.kt
index 51ce0b59..1bde3302 100644
--- a/app/src/main/java/net/pokeranalytics/android/calculus/Calculator.kt
+++ b/app/src/main/java/net/pokeranalytics/android/calculus/Calculator.kt
@@ -94,6 +94,10 @@ class Calculator {
 
             var results: ComputedResults = ComputedResults()
 
+            if (sessions.size == 0) {
+                return results
+            }
+
             var sum: Double = 0.0
             var totalHands: Double = 0.0
             var bbSum: Double = 0.0
diff --git a/app/src/main/java/net/pokeranalytics/android/calculus/Computable.kt b/app/src/main/java/net/pokeranalytics/android/calculus/Computable.kt
index d4aabc47..8df9abc2 100644
--- a/app/src/main/java/net/pokeranalytics/android/calculus/Computable.kt
+++ b/app/src/main/java/net/pokeranalytics/android/calculus/Computable.kt
@@ -97,6 +97,13 @@ class ComputedResults() {
         }
     }
 
+    /**
+     * Returns the number of computed stats
+     */
+    fun numberOfStats() : Int {
+        return this._computedStats.size
+    }
+
 }
 
 class Point(x: Double, y: Double) {