diff --git a/boatmovers/models.py b/boatmovers/models.py
index b02c69cf..ccf22a38 100644
--- a/boatmovers/models.py
+++ b/boatmovers/models.py
@@ -245,7 +245,10 @@ class Result(models.Model):
                     "Cannot have the same crew more than one time in a race"
                 )
         if len(athletes) != len(set(athletes)):
-            print([item for item, count in collections.Counter(athletes).items() if count>1])
+            print('')
+            res = [item for item, count in collections.Counter(athletes).items() if count>1]
+            for id in res:
+                print(Athlete.objects.get(id=id))
             raise ValidationError(
                 "Cannot have the same athlete in different crews in a race"
             )
diff --git a/rowers/templatetags/rowerfilters.py b/rowers/templatetags/rowerfilters.py
index 6fc2fee0..789aebe9 100644
--- a/rowers/templatetags/rowerfilters.py
+++ b/rowers/templatetags/rowerfilters.py
@@ -521,8 +521,10 @@ def deltatimeprint(d):  # pragma: no cover
 @register.filter
 def c2userid(user):  # pragma: no cover
     c2integration = C2Integration(user)
-
-    c2userid = c2integration.get_userid(user)
+    try:
+        c2userid = c2integration.get_userid(user)
+    except NoTokenError:
+        return 0
 
     return c2userid
 
diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz
index b96daad5..cdba5ab3 100644
Binary files a/rowers/tests/testdata/testdata.tcx.gz and b/rowers/tests/testdata/testdata.tcx.gz differ