Index: http-transportmod.scm
==================================================================
--- http-transportmod.scm
+++ http-transportmod.scm
@@ -526,11 +526,12 @@
 	    (debug:print 0 *default-log-port* "SERVER: dbprep")
 	    (set! *dbstruct-db*  (db:setup #t)) ;;  run-id))
 	    (set! server-going #t)
 	    (debug:print 0 *default-log-port* "SERVER: running, megatest version: " (common:get-full-version)) ;; NOTE: the server is NOT yet marked as running in the log. We do that in the keep-running routine.
 	    (if watchdog
-		(thread-start! watchdog)
+		(if (not (member (thread-state watchdog) '(ready running blocked sleeping)))
+		    (thread-start! watchdog))
 		(debug:print 0 *default-log-port* "ERROR: *watchdog* not setup, cannot start it."))))
       
       ;; when things go wrong we don't want to be doing the various queries too often
       ;; so we strive to run this stuff only every four seconds or so.
       (let* ((sync-time (- (current-milliseconds) start-time))

Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -54,11 +54,11 @@
 (declare (uses configfmod.import))
 (declare (uses bigmod.import))
 (declare (uses dbmod.import))
 (declare (uses rmtmod.import))
 (declare (uses servermod.import))
-(declare (uses http-transportmod))
+(declare (uses http-transportmod.import))
 
 ;; (include "call-with-environment-variables/call-with-environment-variables.scm")
 
 (module megatest-main
 	*