Modified: CalendarServer/trunk/calendarserver/tap/caldav.py (3610 => 3611)

--- CalendarServer/trunk/calendarserver/tap/caldav.py	2009-01-26 16:48:32 UTC (rev 3610)
+++ CalendarServer/trunk/calendarserver/tap/caldav.py	2009-01-27 00:31:10 UTC (rev 3611)
@@ -190,8 +190,13 @@
 
         self.log_info("Reading configuration from file: %s"
                       % (self["config"],))
-        config.loadConfig(self["config"])
 
+        try:
+            config.loadConfig(self["config"])
+        except ConfigurationError, e:
+            log.err("Invalid configuration: %s" % (e,))
+            sys.exit(1)
+
         config.updateDefaults(self.overrides)
 
         uid, gid = None, None