diff --git a/rowers/dataprep.py b/rowers/dataprep.py
index 42f02b01..acbad6cc 100644
--- a/rowers/dataprep.py
+++ b/rowers/dataprep.py
@@ -423,7 +423,8 @@ def save_workout_database(f2,r,dosmooth=True,workouttype='rower',
         except KeyError:
             pass
 
-
+    if np.isnan(totaltime):
+        totaltime = 0
 
     hours = int(totaltime/3600.)
     if hours>23:
diff --git a/rowers/tpstuff.py b/rowers/tpstuff.py
index 3dfad6a9..f045f1c5 100644
--- a/rowers/tpstuff.py
+++ b/rowers/tpstuff.py
@@ -152,7 +152,9 @@ def get_token(code):
         refresh_token = token_json['refresh_token']
     except KeyError:
         thetoken = 0
-
+        expires_in = 0
+        refresh_token = 0
+        
     return thetoken,expires_in,refresh_token
 
 # Make authorization URL including random string
diff --git a/rowers/views.py b/rowers/views.py
index 99d52253..4dbdb877 100644
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -1230,10 +1230,10 @@ def workout_tp_upload_view(request,id=0):
     message = ""
     r = Rower.objects.get(user=request.user)
     res = -1
-    #    try:
-    thetoken = tp_open(r.user)
-    #    except TPNoTokenError:
-    #	return HttpResponseRedirect("/rowers/me/tpauthorize/")
+    try:
+        thetoken = tp_open(r.user)
+    except TPNoTokenError:
+        return HttpResponseRedirect("/rowers/me/tpauthorize/")
 
     # ready to upload. Hurray
     try: