diff --git a/rowers/c2stuff.py b/rowers/c2stuff.py
index 46cff86f..91a7493c 100644
--- a/rowers/c2stuff.py
+++ b/rowers/c2stuff.py
@@ -245,7 +245,11 @@ def createc2workoutdata_as_splits(w):
 # API
 def createc2workoutdata(w):
     filename = w.csvfilename
-    row = rowingdata(filename)
+    try:
+        row = rowingdata(filename)
+    except IOError:
+        return 0
+    
     averagehr = int(row.df[' HRCur (bpm)'].mean())
     maxhr = int(row.df[' HRCur (bpm)'].max())
 
diff --git a/rowers/templates/advancedotw.html b/rowers/templates/advancedotw.html
index e6c03f20..3b8ac298 100644
--- a/rowers/templates/advancedotw.html
+++ b/rowers/templates/advancedotw.html
@@ -190,6 +190,18 @@
       See (and save) the big interactive plot
     </p>
   </div>
+  <div class="grid_2 suffix_2 omega">
+    <p>
+    {% if user.rower.rowerplan == 'pro' or user.rower.rowerplan == 'coach' %}
+    <a class="button blue small" href="/rowers/workout/fusion/{{ workout.id }}/">Sensor Fusion</a>
+    {% else %}
+      <a class="button blue small" href="/rowers/promembership">Dist Metrics Plot</a>
+      {% endif %}
+    </p>
+    <p>
+      Merge data from another source into this workout
+    </p>
+  </div>
 
 </div>
 </div>
diff --git a/rowers/views.py b/rowers/views.py
index a5df9370..979107c2 100644
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -895,6 +895,16 @@ def workout_c2_upload_view(request,id=0):
             return HttpResponseRedirect("/rowers/me/c2authorize")
             
 	data = c2stuff.createc2workoutdata(w)
+        if data == 0:
+            message = "Error: No data file. Contact info@rowsandall.com if this problem persists"
+            url = reverse(workout_export_view,
+		          kwargs = {
+		              'message':str(message),
+		              'id':str(w.id),
+		          })
+
+            return HttpResponseRedirect(url)
+            
 	authorizationstring = str('Bearer ' + thetoken)
 	headers = {'Authorization': authorizationstring,
 		   'user-agent': 'sanderroosendaal',