diff --git a/rowers/underarmourstuff.py b/rowers/underarmourstuff.py
index e0034bda..e88ae9a3 100644
--- a/rowers/underarmourstuff.py
+++ b/rowers/underarmourstuff.py
@@ -415,12 +415,14 @@ def add_workout_from_data(user,importid,data,strokedata,
     timeseries = data['time_series']
 
     # position, distance, speed, cadence, power, 
-    
-    res = splituadata(timeseries['distance'])
 
-    distance = res[1]
-
-    times_distance = res[0]
+    try:
+        res = splituadata(timeseries['distance'])
+        distance = res[1]
+        times_distance = res[0]
+    except KeyError:
+        message = "Error. No distance data"
+        return (0,message)
 
 
     try:
diff --git a/rowers/views/workoutviews.py b/rowers/views/workoutviews.py
index a01cf017..ada6ded4 100644
--- a/rowers/views/workoutviews.py
+++ b/rowers/views/workoutviews.py
@@ -1801,7 +1801,9 @@ def workout_downloadwind_view(request,id=0,
         try:
             row.notes += "\n"+message
         except TypeError:
-            pass
+            if message:
+                row.notes += message
+                
         row.save()
         rowdata.add_wind(windspeed,windbearing)
         rowdata.write_csv(f1,gzip=True)
@@ -1871,7 +1873,8 @@ def workout_downloadmetar_view(request,id=0,
         try:
             row.notes += "\n"+message
         except TypeError:
-            pass
+            if message:
+                row.notes += message
         
         row.save()
         rowdata.add_wind(windspeed,windbearing)