diff --git a/rowers/dataprep.py b/rowers/dataprep.py
index 501154be..6ecbb890 100644
--- a/rowers/dataprep.py
+++ b/rowers/dataprep.py
@@ -736,7 +736,11 @@ def fetchcp(rower,theworkouts,table='cpdata'):
             avgpower2[id] = 0
         return pd.Series([]),pd.Series([]),avgpower2
 
-    dfgrouped = df.groupby(['workoutid'])
+    try:
+        dfgrouped = df.groupby(['workoutid'])
+    except KeyError:
+        avgpower2 = {}
+        return pd.Series([]),pd.Series([]),avgpower2
     try:
         avgpower2 = dict(dfgrouped.mean()['power'].astype(int))
     except KeyError:
@@ -756,10 +760,10 @@ def fetchcp(rower,theworkouts,table='cpdata'):
                       theids,
                       table=table)
 
-        return [],[],avgpower2
+        return pd.Series([]),pd.Series([]),avgpower2
 
 
-    return [],[],avgpower2
+    return pd.Series([]),pd.Series([]),avgpower2
 
 
 # create a new workout from manually entered data
diff --git a/rowers/templates/otwrankings.html b/rowers/templates/otwrankings.html
index 7a9443db..a4b2cdd6 100644
--- a/rowers/templates/otwrankings.html
+++ b/rowers/templates/otwrankings.html
@@ -91,7 +91,7 @@
 	<tr>
 	  <td> {{ workout.distance }} m</td>
 	  <td> {{ workout.duration |durationprint:"%H:%M:%S.%f" }} </td>
-          <td> {{ avgpower|lookup:workout.id|encode }} W</td>
+          <td> {{ avgpower|lookup:workout.id }} W</td>
 	  <td> {{ workout.date }} </td>
 	  <td> {{ workout.averagehr }} </td>
 	  <td> {{ workout.maxhr }} </td>