diff --git a/logos/bcsquare.png b/logos/bcsquare.png
new file mode 100644
index 00000000..547f4488
Binary files /dev/null and b/logos/bcsquare.png differ
diff --git a/logos/boatcoachlogo.xcf b/logos/boatcoachlogo.xcf
new file mode 100644
index 00000000..52f41b8a
Binary files /dev/null and b/logos/boatcoachlogo.xcf differ
diff --git a/rowers/templates/compatibility.html b/rowers/templates/compatibility.html
index 0d47a17b..6dc792cb 100644
--- a/rowers/templates/compatibility.html
+++ b/rowers/templates/compatibility.html
@@ -16,13 +16,14 @@
 <li> CrewNerd (TCX)</li>
 <li> Rowing In Motion (TCX)</li>
 <li> Speedcoach XL (CSV)</li>
-<li> Speedcoach GPS (FIT)</li></ul></p>
+<li> Speedcoach GPS (FIT and CSV)</li></ul></p>
 
 <p>Erg
 <ul>
 <li> Painsled (CSV)</li>
 <li> ErgData (CSV export from Concept2 logbook)</li>
 <li> RowPro (CSV)</li>
+<li> BoatCoach (CSV)</li>
 <li> ErgStick (CSV)</li></ul></p>
 
 
@@ -35,7 +36,7 @@
 <h2>Export Compatibility</h2>
 <ul>
 <li> Concept2 Logbook: Exports stroke by stroke data for erg and OTW rowing</li>
-<li> Strava: </li>
+<li> Strava </li>
 <li> SportTracks</li>
 <li> email (TCX or CSV format)</li></ul></p>
 </div>
diff --git a/rowers/templates/frontpage.html b/rowers/templates/frontpage.html
index 61e08861..1532f44d 100644
--- a/rowers/templates/frontpage.html
+++ b/rowers/templates/frontpage.html
@@ -22,8 +22,9 @@
 	<img src="/static/img/rimsquare.png" alt="RiM icon" width="30" height="30">
 	<img src="/static/img/rpsquare.png" alt="RowPro icon" width="30" height="30">
 	<img src="/static/img/essquare.png" alt="ErgStick icon" width="30" height="30">
+        <img src="/static/img/bcsquare.png" alt="BoatCoach icon" width="30" height="30">
 	<img src="/static/img/pssquare.png" alt="PainSled icon" width="30" height="30">
 </p>
 </div>
 
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/rowers/views.py b/rowers/views.py
index 4c2d1c34..09601c50 100644
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -3686,7 +3686,15 @@ def workout_getc2workout_view(request,c2id):
     res = c2stuff.get_c2_workout(request.user,c2id)
     if (res.status_code == 200):
 	data = res.json()['data']
-	res2 = c2stuff.get_c2_workout_strokes(request.user,c2id)
+        if data['stroke_data']:
+	    res2 = c2stuff.get_c2_workout_strokes(request.user,c2id)
+        else:
+            message = "This workout does not have any stroke data associated with it"
+            url = reverse(workout_c2import_view,
+			  kwargs={
+			      'message':message,
+			  })
+	    return HttpResponseRedirect(url)
 
 	if res2.status_code == 200:
 	    strokedata = pd.DataFrame.from_dict(res2.json()['data'])
diff --git a/static/img/bcsquare.png b/static/img/bcsquare.png
new file mode 100644
index 00000000..163cef9b
Binary files /dev/null and b/static/img/bcsquare.png differ