diff --git a/rowers/dataroutines.py b/rowers/dataroutines.py
index 75b62a8b..1c5d9ae9 100644
--- a/rowers/dataroutines.py
+++ b/rowers/dataroutines.py
@@ -1732,6 +1732,8 @@ def read_data(columns, ids=[], doclean=True, workstrokesonly=True, debug=False,
 
         try:
             datadf = pl.concat(data)
+        except ShapeError:
+            return pl.DataFrame()
         except SchemaError:
             try:
                 data = [
diff --git a/rowers/idoklad.py b/rowers/idoklad.py
index 684f8d18..49cfbfa0 100644
--- a/rowers/idoklad.py
+++ b/rowers/idoklad.py
@@ -123,7 +123,7 @@ def create_contact(rower):
     data = {
         'City': rower.city,
         'CompanyName': rower.user.first_name+" "+rower.user.last_name,
-        'CountryId': get_country_id(rower.country.code),
+        'CountryId': get_country_id(rower.country),
         'Email': rower.user.email,
         'Firstname': rower.user.first_name,
         'PostalCode': rower.postal_code,
diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz
index 8c06d57a..889110b9 100644
Binary files a/rowers/tests/testdata/testdata.tcx.gz and b/rowers/tests/testdata/testdata.tcx.gz differ
diff --git a/rowers/views/paymentviews.py b/rowers/views/paymentviews.py
index 84cc04fe..4d378e01 100644
--- a/rowers/views/paymentviews.py
+++ b/rowers/views/paymentviews.py
@@ -130,8 +130,11 @@ def billing_view(request):
         if billingaddressform.is_valid():
             cd = billingaddressform.cleaned_data
             for attr, value in cd.items():
-                setattr(r, attr, value)
-            r.save()
+                try:
+                    setattr(r, attr, value)
+                    r.save()
+                except:
+                    pass
 
         if billingaddressform.is_valid():
             if planselectform.is_valid():