diff --git a/rowers/dataprep.py b/rowers/dataprep.py
index f568aab3..1aae86d9 100644
--- a/rowers/dataprep.py
+++ b/rowers/dataprep.py
@@ -484,7 +484,7 @@ def join_workouts(r,ids,title='Joined Workout',
         w = Workout.objects.get(id=id)
         w.duplicate  = False
         w.save()
-        if "duplicate" in message:
+        if message is not None and "duplicate" in message:
             message = ""
 
     return (id, message)