diff --git a/addons/website_event_track/controllers/event.py b/addons/website_event_track/controllers/event.py
index b044b964ed1..888ab47f3f9 100644
--- a/addons/website_event_track/controllers/event.py
+++ b/addons/website_event_track/controllers/event.py
@@ -148,7 +148,7 @@ class website_event(http.Controller):
                     keys = unsort_tracks[track[2][:8]].keys()
                     secret_key = keys[index]
                     row_span = index
-                if value[1] == end_time:
+                if value[1] == end_time and secret_key:
                     if not index == row_span:
                         index = index + 1  
                     event_tracks = event_track_obj.browse(request.cr, request.uid, track[0], context=request.context)
diff --git a/addons/website_event_track/models/event.py b/addons/website_event_track/models/event.py
index c829660fb64..4da6706e186 100644
--- a/addons/website_event_track/models/event.py
+++ b/addons/website_event_track/models/event.py
@@ -107,6 +107,7 @@ class event_track(osv.osv):
             ids_to_compare = self.search(cr, uid, [("id","!=",track.id),('event_id', '=', track.event_id.id),('location_id', '=', track.location_id.id)])
             start_time = datetime.datetime.strptime(track.date, '%Y-%m-%d %H:%M:%S')
             end_time = start_time + datetime.timedelta(minutes = track.duration)
+            if end_time <= start_time:return False
             for com_track in self.browse(cr, uid, ids_to_compare, context=context):
                 com_start_time = datetime.datetime.strptime(com_track.date, '%Y-%m-%d %H:%M:%S')
                 com_end_time = com_start_time + datetime.timedelta(minutes = com_track.duration)