diff --git a/rowers/dataprep.py b/rowers/dataprep.py
index 7889a708..c042b4af 100644
--- a/rowers/dataprep.py
+++ b/rowers/dataprep.py
@@ -1683,9 +1683,9 @@ def workout_trimp(w, reset=False):
 
     trimp = 0
     averagehr = 0
-    if w.trimp > 0:
+    if w.trimp is not None and w.trimp > 0:
         trimp = w.trimp
-    if w.averagehr > 0:
+    if w.averagehr is not None and w.averagehr > 0:
         averagehr = w.averagehr
 
     return trimp, averagehr
diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz
index b484ac65..44f5eb51 100644
Binary files a/rowers/tests/testdata/testdata.tcx.gz and b/rowers/tests/testdata/testdata.tcx.gz differ