diff --git a/rowers/integrations/strava.py b/rowers/integrations/strava.py
index 606a3182..b78281a0 100644
--- a/rowers/integrations/strava.py
+++ b/rowers/integrations/strava.py
@@ -7,7 +7,7 @@ from rowers import mytypes
 from rowers.tasks import handle_strava_sync, fetch_strava_workout
 from stravalib.exc import ActivityUploadFailed, TimeoutExceeded
 from rowers.rower_rules import is_workout_user, ispromember
-from rowers.utils import get_strava_stream
+from rowers.utils import get_strava_stream, custom_exception_handler
 
 from rowers.utils import myqueue, dologging
 #from rowers.imports import *
diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz
index 2bc3badc..56e95994 100644
Binary files a/rowers/tests/testdata/testdata.tcx.gz and b/rowers/tests/testdata/testdata.tcx.gz differ
diff --git a/rowers/utils.py b/rowers/utils.py
index a77e3fd8..73f88262 100644
--- a/rowers/utils.py
+++ b/rowers/utils.py
@@ -898,6 +898,8 @@ def ps_dict_order_dict(d, short=False):
 def ps_dict_order(d, short=False, rower=None, html=True):
     sdict = collections.OrderedDict({})
     steps = d['steps']
+    if steps is None:
+        steps = []
 
     ftp = 200
     powerzones = None