diff --git a/rowers/dataprep.py b/rowers/dataprep.py
index 8a85b83a..8197c6d8 100644
--- a/rowers/dataprep.py
+++ b/rowers/dataprep.py
@@ -642,7 +642,7 @@ def join_workouts(r, ids, title='Joined Workout',
 
     while len(files):
         row2 = rdata(files[0])
-        if row2 != 0:
+        if row2 != 0 and row2 is not None:
             row = row+row2
         files = files[1:]
 
diff --git a/rowers/rojabo_stuff.py b/rowers/rojabo_stuff.py
index 09c4313e..ffce6958 100644
--- a/rowers/rojabo_stuff.py
+++ b/rowers/rojabo_stuff.py
@@ -1,5 +1,6 @@
 from rowers.models import Rower, Workout, TombStone
 from rowers import utils
+from rowers.utils import NoTokenError
 import datetime
 from django.utils import timezone
 from datetime import timedelta
diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz
index b700405a..a4ae0ddb 100644
Binary files a/rowers/tests/testdata/testdata.tcx.gz and b/rowers/tests/testdata/testdata.tcx.gz differ