diff --git a/rowers/views.py b/rowers/views.py
index a1454f3e..3c62bafd 100644
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -12485,9 +12485,12 @@ def workout_summary_edit_view(request,id,message="",successmessage=""
 
     initial = {}
     for i in xrange(nrintervals):
-	initial['intervald_%s' % i] = idist[i]
-	initial['intervalt_%s' % i] = get_time(itime[i])
-	initial['type_%s' % i] = itype[i]
+        try:
+	    initial['intervald_%s' % i] = idist[i]
+	    initial['intervalt_%s' % i] = get_time(itime[i])
+	    initial['type_%s' % i] = itype[i]
+        except IndexError:
+            pass
 
 
     detailform = IntervalUpdateForm(aantal=nrintervals,initial=initial)