diff --git a/rowers/plannedsessions.py b/rowers/plannedsessions.py
index cb174375..63286c21 100644
--- a/rowers/plannedsessions.py
+++ b/rowers/plannedsessions.py
@@ -723,8 +723,18 @@ def get_dates_timeperiod(request,startdatestring='',enddatestring='',
             startdate = dt.datetime.strptime(startdatestring,'%Y-%m-%d').date()
             enddate = dt.datetime.strptime(enddatestring,'%Y-%m-%d').date()
         except ValueError:
-            startdate = parser.parse(startdatestring,fuzzy=True).date()
-            enddate = parser.parse(enddatestring, fuzzy=True).date()
+            try:
+                startdate = parser.parse(startdatestring,fuzzy=True).date()
+                enddate = parser.parse(enddatestring, fuzzy=True).date()
+            except ValueError:
+                startdate = timezone.now()-timezone.timedelta(days=5)
+                startdate = startdate.date()
+                enddate = timezone.now().date()
+
+        if startdate>enddate:
+            e = startdate
+            startdate = enddate
+            enddate = e
 
         return startdate,enddate