diff --git a/rowers/dataprep.py b/rowers/dataprep.py
index 1f6a27ba..ced2f2ac 100644
--- a/rowers/dataprep.py
+++ b/rowers/dataprep.py
@@ -1083,7 +1083,7 @@ def fitscore(rower,workout):
         indexmax = scores.idxmax()
         delta = df.loc[indexmax,'delta']
         maxvalue = scores.max()
-    except ValueError:
+    except (ValueError,TypeError):
         indexmax = 0
         delta = 0
         maxvalue = 0
@@ -1150,6 +1150,9 @@ def setcp(workout,background=False):
                     'id':workout.id,
                 })
                 df.to_parquet(filename,engine='fastparquet',compression='GZIP')
+                goldmedalstandard, goldmedalduration = fitscore(workout.user,workout)
+                workout.goldmedalstandard  = goldmedalstandard
+                workout.save()
                 return df,delta,cpvalues
 
     return pd.DataFrame({'delta':[],'cp':[]}),pd.Series(),pd.Series()
diff --git a/rowers/utils.py b/rowers/utils.py
index cf76d3ca..6e7b45a2 100644
--- a/rowers/utils.py
+++ b/rowers/utils.py
@@ -327,7 +327,10 @@ def calculate_age(born,today=None):
     if not today:
         today = date.today()
     if born:
-        return today.year - born.year - ((today.month, today.day) < (born.month, born.day))
+        try:
+            return today.year - born.year - ((today.month, today.day) < (born.month, born.day))
+        except AttributeError:
+            return None
     else:
         return None