@@ -60,10 +60,11 @@
       (load debugcontrolf)))
 
 ;; Disabled help items
 ;;  -rollup                 : (currently disabled) fill run (set by :runname)  with latest test(s)
 ;;                            from prior runs with same keys
+;;  -daemonize              : fork into background and disconnect from stdin/out
 
 (define help (conc "
 Megatest, documentation at http://www.kiatoa.com/fossils/megatest
   version " megatest-version "
   license GPL, Copyright Matt Welland 2006-2015
@@ -154,11 +155,10 @@
   -setvars VAR1=val1,VAR2=val2 : Add environment variables to a run NB// these are
                                  overwritten by values set in config files.
   -server -|hostname      : start the server (reduces contention on megatest.db), use
                             - to automatically figure out hostname
   -transport http|rpc     : use http or rpc for transport (default is http) 
-  -daemonize              : fork into background and disconnect from stdin/out
   -log logfile            : send stdout and stderr to logfile
   -list-servers           : list the servers 
   -stop-server id         : stop server specified by id (see output of -list-servers), use
                             0 to kill all
   -repl                   : start a repl (useful for extending megatest)
@@ -427,18 +427,23 @@
         (define *didsomething* #t)  
         (exit 1))))
 
     
 (if (or (args:get-arg "-log")(args:get-arg "-server")) ;; redirect the log always when a server
-    (let* ((tl   (or (args:get-arg "-log")(launch:setup)))   ;; run launch:setup if -server
-	   (logf (or (args:get-arg "-log") ;; use -log unless we are a server, then craft a logfile name
-		     (conc tl "/logs/server-" (current-process-id) "-" (get-host-name) ".log")))
-	   (oup  (open-logfile logf)))
-      (if (not (args:get-arg "-log"))
-	  (hash-table-set! args:arg-hash "-log" logf)) ;; fake out future queries of -log
-      (debug:print-info 0 *default-log-port* "Sending log output to " logf)
-      (set! *default-log-port* oup)))
+    (handle-exceptions
+	exn
+	(begin
+	  (print "ERROR: Failed to switch to log output. " ((conition-property-accessor 'exn 'message) exn))
+	  )
+      (let* ((tl   (or (args:get-arg "-log")(launch:setup)))   ;; run launch:setup if -server
+	     (logf (or (args:get-arg "-log") ;; use -log unless we are a server, then craft a logfile name
+		       (conc tl "/logs/server-" (current-process-id) "-" (get-host-name) ".log")))
+	     (oup  (open-logfile logf)))
+	(if (not (args:get-arg "-log"))
+	    (hash-table-set! args:arg-hash "-log" logf)) ;; fake out future queries of -log
+	(debug:print-info 0 *default-log-port* "Sending log output to " logf)
+	(set! *default-log-port* oup))))
 
 (if (or (args:get-arg "-h")
 	(args:get-arg "-help")
 	(args:get-arg "--help"))
     (begin