diff --git a/rowers/dataprep.py b/rowers/dataprep.py
index 6ecbb890..4f62e80d 100644
--- a/rowers/dataprep.py
+++ b/rowers/dataprep.py
@@ -1638,6 +1638,8 @@ def rdata(file, rower=rrower()):
             res = rrdata()
         except:
             res = rrdata()
+    except EOFError:
+        res = rrdata()
 
     return res
 
diff --git a/rowers/rows.py b/rowers/rows.py
index 9b6331d6..6393fa02 100644
--- a/rowers/rows.py
+++ b/rowers/rows.py
@@ -83,15 +83,15 @@ def validate_kml(value):
     
 
 def handle_uploaded_image(i):
-        import StringIO
+        from io import StringIO, BytesIO
         from PIL import Image, ImageOps, ExifTags
         import os
         from django.core.files import File
-        image_str = ""
+        image_str = b''
         for chunk in i.chunks():
                 image_str += chunk
 
-        imagefile = StringIO.StringIO(image_str)
+        imagefile = BytesIO(image_str)
         
                 
         image = Image.open(i)
diff --git a/rowers/tests/testdata/testdata.csv.gz b/rowers/tests/testdata/testdata.csv.gz
index c2a8912c..4df4a9cd 100644
Binary files a/rowers/tests/testdata/testdata.csv.gz and b/rowers/tests/testdata/testdata.csv.gz differ