diff --git a/rowers/templates/500.html b/rowers/templates/500.html
index a64a6d92..d64e7bf2 100644
--- a/rowers/templates/500.html
+++ b/rowers/templates/500.html
@@ -11,6 +11,13 @@
 <p>
 The site reported an internal server error. If this behavior repeats, please inform us by using the contact form at the bottom of this page. This allows us to improve the site's behaviour.
 </p>
+
+<p>
+  You can also report an issue on the Rowsandall Bitbucket issue list:
+    </p>
+<div class="grid_2 alpha">
+  <a class="button red small" href="https://bitbucket.org/sanderroosendaal/rowsandall/issues/new">Report an issue</a>
+  </div>
 </div>
 
 {% endblock %}
diff --git a/rowers/views.py b/rowers/views.py
index 946f2d89..5c8e77c6 100644
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -3799,6 +3799,7 @@ def workout_upload_view(request,message=""):
 
             # Some people try to upload Concept2 logbook summaries
             if fileformat == 'c2log':
+                os.remove(f2)
                 message = "This C2 logbook summary does not contain stroke data. Please download the Export Stroke Data file from the workout details on the C2 logbook."
 		url = reverse(workout_upload_view,
 			      args=[str(message)])
@@ -3807,6 +3808,7 @@ def workout_upload_view(request,message=""):
 
             # Some people try to upload RowPro summary logs
             if fileformat == 'rowprolog':
+                os.remove(f2)
                 message = "This RowPro logbook summary does not contain stroke data. Please use the Stroke Data CSV file for the individual workout in your log."
 		url = reverse(workout_upload_view,
 			      args=[str(message)])