diff --git a/rowers/dataprep.py b/rowers/dataprep.py
index 973147d2..5d369573 100644
--- a/rowers/dataprep.py
+++ b/rowers/dataprep.py
@@ -1636,7 +1636,11 @@ def workout_trimp(w, reset=False):
             return w.trimp, 0
     elif w.trimp <= 0 and w.averagehr > 0:
         if get_existing_job(w):
-            return 0, 100.*(w.averagehr/r.hrftp)*(w.duration.hour*60 + w.duration.minute)/60.
+            try:
+                return 0, 100.*(w.averagehr/r.hrftp)*(w.duration.hour*60 + w.duration.minute)/60.
+            except ZeroDivisionError:
+                return 0, 0
+                
         ftp = float(r.ftp)
         _ = myqueue(
             queuehigh,
diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz
index 84d5735c..b4b43516 100644
Binary files a/rowers/tests/testdata/testdata.tcx.gz and b/rowers/tests/testdata/testdata.tcx.gz differ