diff --git a/rowers/stravastuff.py b/rowers/stravastuff.py
index fdad80f4..30835e14 100644
--- a/rowers/stravastuff.py
+++ b/rowers/stravastuff.py
@@ -590,6 +590,11 @@ def add_workout_from_data(user,importid,data,strokedata,
     return id,message
 
 def workout_strava_upload(user,w):
+    try:
+        thetoken = strava_open(user)
+    except NoTokenError:
+        return "Please connect to Strava first",0
+    
     message = "Uploading to Strava"
     stravaid=-1
     r = Rower.objects.get(user=user)
diff --git a/rowers/uploads.py b/rowers/uploads.py
index 6aeca4d7..ac60340c 100644
--- a/rowers/uploads.py
+++ b/rowers/uploads.py
@@ -294,7 +294,7 @@ def upload_options(body):
         try:
             for key, value in yml.iteritems():
                 lowkey = key.lower()
-                if lowkey == 'sync' or lowkey == 'synchronization':
+                if lowkey == 'sync' or lowkey == 'synchronization' or lowkey == 'export':
                     uploadoptions = getsyncoptions(uploadoptions,value)
                 if lowkey == 'chart' or lowkey == 'static' or lowkey == 'plot':
                     uploadoptions = getplotoptions(uploadoptions,value)