diff --git a/rowers/c2stuff.py b/rowers/c2stuff.py
index 88b1fe76..9f5639ad 100644
--- a/rowers/c2stuff.py
+++ b/rowers/c2stuff.py
@@ -242,6 +242,10 @@ def createc2workoutdata_as_splits(w):
     except ValueError:
 	durationstr = datetime.strptime(str(w.duration),"%H:%M:%S")
 
+    try:
+        newnotes = w.notes+'\n from '+w.workoutsource+' via rowsandall.com'
+    except TypeError:
+        newnotes = 'from '+w.workoutsource+' via rowsandall.com'
 
     data = {
 	"type": w.workouttype,
@@ -250,7 +254,7 @@ def createc2workoutdata_as_splits(w):
 	"time": int(10*makeseconds(durationstr)),
 	"timezone": "Etc/UTC",
 	"weight_class": c2wc(w.weightcategory),
-	"comments": w.notes+'\n from '+w.workoutsource+' via rowsandall.com',
+	"comments": newnotes,
 	"heart_rate": {
 	    "average": averagehr,
 	    "max": maxhr,
diff --git a/rowers/runkeeperstuff.py b/rowers/runkeeperstuff.py
index 267e421e..38a01d82 100644
--- a/rowers/runkeeperstuff.py
+++ b/rowers/runkeeperstuff.py
@@ -232,6 +232,11 @@ def createrunkeeperworkoutdata(w):
         distancedata.append(point)
 
     start_time = w.startdatetime.strftime("%a, %d %b %Y %H:%M:%S")
+
+    try:
+        newnotes = w.notes+'\n from '+w.workoutsource+' via rowsandall.com'
+    except TypeError:
+        newnotes = 'from '+w.workoutsource+' via rowsandall.com'
         
     if haslatlon:
 	data = {
@@ -239,7 +244,7 @@ def createrunkeeperworkoutdata(w):
 	    "start_time": start_time,
 	    "total_distance": int(w.distance),
 	    "duration": duration,
-	    "notes": w.notes+'\n from '+w.workoutsource+' via rowsandall.com',
+	    "notes": newnotes,
 	    "average_heart_rate": averagehr,
 	    "path": locdata,
 	    "distance": distancedata,
@@ -253,7 +258,7 @@ def createrunkeeperworkoutdata(w):
 	    "start_time": start_time,
 	    "total_distance": int(w.distance),
 	    "duration": duration,
-	    "notes": w.notes+'\n from '+w.workoutsource+' via rowsandall.com',
+	    "notes": newnotes,
 	    "avg_heartrate": averagehr,
 	    "distance": distancedata,
 	    "heart_rate": hrdata,
diff --git a/rowers/sporttracksstuff.py b/rowers/sporttracksstuff.py
index b16df358..8711c738 100644
--- a/rowers/sporttracksstuff.py
+++ b/rowers/sporttracksstuff.py
@@ -281,7 +281,7 @@ def createsporttracksworkoutdata(w):
     try:
         w.notes = w.notes+'\n from '+w.workoutsource+' via rowsandall.com',
     except TypeError:
-        w.notes = w.notes+' via rowsandall.com'
+        w.notes = 'from '+w.workoutsource+' via rowsandall.com'
         
     if haslatlon:
 	data = {
diff --git a/rowers/underarmourstuff.py b/rowers/underarmourstuff.py
index 277b72bb..42ca58f6 100644
--- a/rowers/underarmourstuff.py
+++ b/rowers/underarmourstuff.py
@@ -228,7 +228,10 @@ def createunderarmourworkoutdata(w):
     duration += w.duration.second
     duration += +1.0e-6*w.duration.microsecond
     name = w.name
-    notes = w.notes+'\n from '+w.workoutsource+' via rowsandall.com'
+    try:
+        notes = w.notes+'\n from '+w.workoutsource+' via rowsandall.com'
+    except TypeError:
+        notes = 'from '+w.workoutsource+' via rowsandall.com'
 
     # adding diff, trying to see if this is valid
     #t = row.df.ix[:,'TimeStamp (sec)'].values-10*row.df.ix[0,'TimeStamp (sec)']
diff --git a/rowers/views.py b/rowers/views.py
index dbf0ac41..3e86de9c 100644
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -1266,9 +1266,13 @@ def workout_strava_upload_view(request,id=0):
 	        tcxfile,tcxmessg = stravastuff.createstravaworkoutdata(w)
                 if tcxfile:
 		    with open(tcxfile,'rb') as f:
+                        try:
+                            newnotes = w.notes+'\n from '+w.workoutsource+' via rowsandall.com'
+                        except TypeError:
+                            newnotes = 'from '+w.workoutsource+' via rowsandall.com'
 		        res,mes = stravastuff.handle_stravaexport(f,w.name,
 							      r.stravatoken,
-							      description=w.notes+'\n from '+w.workoutsource+' via rowsandall.com')
+							          description=newnotes)
                         if res==0:
                             messages.error(request,mes)
 		            w.uploadedtostrava = -1