diff --git a/rowers/dataprep.py b/rowers/dataprep.py
index 55da70ec..5eca407c 100644
--- a/rowers/dataprep.py
+++ b/rowers/dataprep.py
@@ -1856,6 +1856,7 @@ parsers = {
 def parsenonpainsled(fileformat,f2,summary,startdatetime=''):
     try:
         row = parsers[fileformat](f2)
+        print(row,'jet')
         if startdatetime != '':
             row.rowdatetime = arrow.get(startdatetime).datetime
         hasrecognized = True
diff --git a/rowers/nkstuff.py b/rowers/nkstuff.py
index eb42f748..930b898b 100644
--- a/rowers/nkstuff.py
+++ b/rowers/nkstuff.py
@@ -44,13 +44,13 @@ oauth_data = {
     'client_id': NK_CLIENT_ID,
     'client_secret': NK_CLIENT_SECRET,
     'redirect_uri': NK_REDIRECT_URI,
-    'autorization_uri': "https:#oauth-stage.nkrowlink.com/oauth/authorize",
+    'autorization_uri': "https://oauth-stage.nkrowlink.com/oauth/authorize",
     'content_type': 'application/json',
     'tokenname': 'nktoken',
     'refreshtokenname': 'nkrefreshtoken',
     'expirydatename': 'nktokenexpirydate',
     'bearer_auth': True,
-    'base_url': "https:#oauth-stage.nkrowlink.com/oauth/token",
+    'base_url': "https://oauth-stage.nkrowlink.com/oauth/token",
     'scope':'read',
     }
 
@@ -287,13 +287,17 @@ def get_workout(user,nkid):
 
     df = pd.DataFrame.from_dict(strokeData)
     oarlockData = df['oarlockStrokes']
+
     oarlockData = oarlockData.apply(lambda x:getdict(x, seatIndex=1))
     df2 = pd.DataFrame.from_records(oarlockData.values)
 
     df.set_index('timestamp')
-    df2.set_index('timestamp')
-    df = df.merge(df2,left_index=True,right_index=True)
-    df = df.rename(columns={"timestamp_x":"timestamp"})
+
+    if not df2.empty:
+        df2.set_index('timestamp')
+        df = df.merge(df2,left_index=True,right_index=True)
+        df = df.rename(columns={"timestamp_x":"timestamp"})
+
     df = df.drop('oarlockStrokes',axis=1)
     df.sort_values(by='timestamp',ascending=True,inplace=True)
     df.fillna(inplace=True,method='ffill')
@@ -321,5 +325,6 @@ def get_workout(user,nkid):
 
     # not to_csv and run upload API!
     #strokedata = df.to_json(orient='records')
+    #df.to_csv('~/Downloads/nk_logbook.csv')
 
     return workoutdata, df
diff --git a/rowers/views/workoutviews.py b/rowers/views/workoutviews.py
index 6553b0fa..ca46185e 100644
--- a/rowers/views/workoutviews.py
+++ b/rowers/views/workoutviews.py
@@ -4870,6 +4870,7 @@ def workout_upload_api(request):
         q = request.POST
         post_data = {k: q.getlist(k) if len(q.getlist(k))>1 else v for k, v in q.items()}
 
+
     # only allow local host
     hostt = request.get_host().split(':')
     if hostt[0] not in ['localhost','127.0.0.1','dev.rowsandall.com','rowsandall.com']:
@@ -4916,6 +4917,12 @@ def workout_upload_api(request):
     except KeyError:
         c2id = ''
 
+    try:
+        nkid = post_data['nkid']
+    except KeyError:
+        nkid = ''
+
+
     try:
         rp3id = post_data['rp3id']
     except KeyError: