diff --git a/rowers/dataprep.py b/rowers/dataprep.py
index 0aa9cb97..1337e3a6 100644
--- a/rowers/dataprep.py
+++ b/rowers/dataprep.py
@@ -585,15 +585,19 @@ def save_workout_database(f2,r,dosmooth=True,workouttype='rower',
         if timezone_str == None:
             timezone_str = tf.closest_timezone_at(lng=lonavg,
                                                   lat=latavg)
+            if timezone_str == None:
+                timezone_str = 'UTC'
+        try:
             workoutstartdatetime = pytz.timezone(timezone_str).localize(
                 row.rowdatetime
             )
-        
-            
-    except ValueError,KeyError:
-        workoutstartdatetime = thetimezone.localize(
-            row.rowdatetime
-        ).astimezone(utc)
+        except ValueError:
+            workoutstartdatetime = workoutstartdatetime.astimezone(
+                pytz.timezone(timezone_str)
+                )
+    except KeyError:
+        timezone_str = 'UTC'
+
 
 
     workoutdate = workoutstartdatetime.astimezone(