--- SessionSchedule.original	2013-11-05 07:56:24.000000000 -0500
+++ SessionSchedule.java	2014-01-03 18:01:46.000000000 -0500
@@ -48,7 +48,12 @@
         } else {
             nonStopSession = false;
         }
-            
+        TimeZone defaultTimeZone = getDefaultTimeZone(settings, sessionID);
+        if (nonStopSession) {
+            startTime = endTime = new TimeEndPoint(NOT_SET,  0,  0,  0, defaultTimeZone);
+            return;
+        }
+        
         boolean startDayPresent = settings.isSetting(sessionID, Session.SETTING_START_DAY);
         boolean endDayPresent = settings.isSetting(sessionID, Session.SETTING_END_DAY);
 
@@ -60,8 +65,6 @@
             throw new ConfigError("Session " + sessionID + ": EndDay used without StartDay");
         }
 
-        TimeZone defaultTimeZone = getDefaultTimeZone(settings, sessionID);
-
         startTime = getTimeEndPoint(settings, sessionID, defaultTimeZone, Session.SETTING_START_TIME, Session.SETTING_START_DAY);
         endTime = getTimeEndPoint(settings, sessionID, defaultTimeZone, Session.SETTING_END_TIME, Session.SETTING_END_DAY);
         if (!nonStopSession) log.info("["+sessionID+"] "+toString());