Merge branch 'release/v21.2.4'

rowers/nkimportutils.py

@@ -97,6 +97,7 @@ def add_workout_from_data(userid, nkid, data, strokedata, source='nk', splitdata
         seatNumber = 1
         oarlockfirmware = ''
         boatName = ''
+        portStarboard = 'port'
 
     workouttype = "water"
     boattype = "1x"

rowers/tasks.py

@@ -2069,7 +2069,10 @@ def handle_sendemail_breakthrough(workoutid, useremail,
                                   **kwargs):
 
     btvalues = pd.read_json(btvalues)
+    try:
         btvalues.sort_values('delta', axis=0, inplace=True)
+    except KeyError:
+        return 0
 
     lastname = ''