Index: client.scm
==================================================================
--- client.scm
+++ client.scm
@@ -65,13 +65,11 @@
 	(if server-dat
 	    (let ((start-res (http-transport:client-connect run-id ;; NB// confusion over server-dat and connection result!
 							    (tasks:hostinfo-get-interface server-dat)
 							    (tasks:hostinfo-get-port      server-dat))))
 	      (if start-res ;; sucessful login?
-		  (begin
-		    (hash-table-set! *runremote* run-id start-res)
-		    start-res)
+		  start-res
 		  (begin    ;; login failed
 		    (hash-table-delete! *runremote* run-id)
 		    (open-run-close tasks:server-force-clean-run-record
 				    tasks:open-db
 				    run-id 
@@ -83,13 +81,11 @@
 	      (if server-dat
 		  (let ((start-res (http-transport:client-connect run-id
 								  (tasks:hostinfo-get-interface server-dat)
 								  (tasks:hostinfo-get-port      server-dat))))
 		    (if start-res
-			(begin
-			  (hash-table-set! *runremote* run-id start-res)
-			  start-res)
+			start-res
 			(begin    ;; login failed
 			  (hash-table-delete! *runremote* run-id)
 			  (open-run-close tasks:server-force-clean-run-record
 					  tasks:open-db
 					  run-id 

Index: common.scm
==================================================================
--- common.scm
+++ common.scm
@@ -23,10 +23,17 @@
 
 ;; (require-library margs)
 ;; (include "margs.scm")
 
 (define getenv get-environment-variable)
+(define (safe-setenv key val)
+  (if (and (string? val)(string? key))
+      (handle-exceptions
+       exn
+       (debug:print 0 "ERROR: bad value for setenv, key=" key ", value=" val)
+       (setenv key val))
+      (debug:print 0 "ERROR: bad value for setenv, key=" key ", value=" val)))
 
 (define home (getenv "HOME"))
 (define user (getenv "USER"))
 
 ;; GLOBAL GLETCHES

Index: configf.scm
==================================================================
--- configf.scm
+++ configf.scm
@@ -217,17 +217,11 @@
 								  (envar   (and environ-patt (string-search (regexp environ-patt) curr-section-name)))
 								  (realval (if envar
 									       (config:eval-string-in-environment val)
 									       val)))
 							     (debug:print-info 6 "read-config env setting, envar: " envar " realval: " realval " val: " val " key: " key " curr-section-name: " curr-section-name)
-							     (if envar
-								 (if (and (string? realval)(string? key))
-								     (handle-exceptions
-								      exn
-								      (debug:print 0 "ERROR: bad value for setenv, key=" key ", value=" realval)
-								      (setenv key realval))
-								     (debug:print 0 "ERROR: bad value for setenv, key=" key ", value=" realval)))
+							     (if envar (safe-setenv key realval))
 							     (hash-table-set! res curr-section-name 
 									      (config:assoc-safe-add alist key realval))
 							     (loop (configf:read-line inp res allow-system) curr-section-name key #f)))
 	       (configf:key-no-val ( x key val)             (let* ((alist   (hash-table-ref/default res curr-section-name '())))
 							      (hash-table-set! res curr-section-name 

Index: lock-queue.scm
==================================================================
--- lock-queue.scm
+++ lock-queue.scm
@@ -48,24 +48,32 @@
               CONSTRAINT runlock_constraint UNIQUE (run_lock));")))
     (sqlite3:set-busy-handler! db handler)
     db))
 
 (define (lock-queue:set-state db test-id newstate)
-  (sqlite3:execute db "UPDATE queue SET state=? WHERE test_id=?;"
-		   newstate
-		   test-id))
+  (handle-exceptions
+   exn
+   (thread-sleep! 30)
+   (lock-queue:set-state db test-id newstate)
+   (sqlite3:execute db "UPDATE queue SET state=? WHERE test_id=?;"
+		    newstate
+		    test-id)))
 
 (define (lock-queue:any-younger? db mystart test-id)
-  (let ((res #f))
-    (sqlite3:for-each-row
-     (lambda (tid)
-       ;; Actually this should not be needed as mystart cannot be simultaneously less than and test-id same as 
-       (if (not (equal? tid test-id)) 
-	   (set! res tid)))
-     db
-     "SELECT test_id FROM queue WHERE start_time > ?;" mystart)
-    res))
+  (handle-exceptions
+   exn
+   (thread-sleep! 30)
+   (lock-queue:any-younger? db mystart test-id)
+   (let ((res #f))
+     (sqlite3:for-each-row
+      (lambda (tid)
+	;; Actually this should not be needed as mystart cannot be simultaneously less than and test-id same as 
+	(if (not (equal? tid test-id)) 
+	    (set! res tid)))
+      db
+      "SELECT test_id FROM queue WHERE start_time > ?;" mystart)
+     res)))
 
 (define (lock-queue:get-lock db test-id)
   (let ((res       #f)
 	(lckqry    (sqlite3:prepare db "SELECT test_id,run_lock FROM runlocks WHERE run_lock='locked';"))
 	(mklckqry  (sqlite3:prepare db "INSERT INTO runlocks (test_id,run_lock) VALUES (?,'locked');")))

Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -939,11 +939,11 @@
 	  (if (args:get-arg "-set-toplog")
 	      ;; DO NOT run remote
 	      (tests:test-set-toplog! run-id test-name (args:get-arg "-set-toplog")))
 	  (if (args:get-arg "-summarize-items")
 	      ;; DO NOT run remote
-	      (tests:summarize-items db run-id test-id test-name #t)) ;; do force here
+	      (tests:summarize-items run-id test-id test-name #t)) ;; do force here
 	  (if (args:get-arg "-runstep")
 	      (if (null? remargs)
 		  (begin
 		    (debug:print 0 "ERROR: nothing specified to run!")
 		    (if db (sqlite3:finalize! db))

Index: runconfig.scm
==================================================================
--- runconfig.scm
+++ runconfig.scm
@@ -29,11 +29,11 @@
     (debug:print 4 "Using key=\"" thekey "\"")
 
     (if change-env
 	(for-each ;; NB// This can be simplified with new content of keyvals having all that is needed.
 	 (lambda (keyval)
-	   (setenv (car keyval)(cadr keyval)))
+	   (safe-setenv (car keyval)(cadr keyval)))
 	 keyvals))
 	
     (for-each 
      (lambda (section)
        (let ((section-dat (hash-table-ref/default confdat section #f)))
@@ -43,11 +43,11 @@
 		(let ((val (cadr (assoc envvar section-dat))))
 		(hash-table-set! whatfound section (+ (hash-table-ref/default whatfound section 0) 1))
 		(if (and (string? envvar)
 			 (string? val)
 			 change-env)
-		    (setenv envvar val))
+		    (safe-setenv envvar val))
 		(hash-table-set! finaldat envvar val)))
 	      (map car section-dat)))))
      sections)
     (if already-seen
 	(begin

Index: runs.scm
==================================================================
--- runs.scm
+++ runs.scm
@@ -84,11 +84,11 @@
 	  (exit 1)))
     ;; Now have runconfigs data loaded, set environment vars
     (for-each (lambda (section)
 		(for-each (lambda (varval)
 			    (set! envdat (append envdat (list varval)))
-			    (setenv (car varval)(cadr varval)))
+			    (safe-setenv (car varval)(cadr varval)))
 			  (configf:get-section runconfig section)))
 	      (list "default" target))
     (vector target runname testpatt keys keyvals envdat mconfig runconfig serverdat transport db toppath run-id)))
 
 (define (set-megatest-env-vars run-id #!key (inkeys #f)(inrunname #f)(inkeyvals #f))
@@ -110,14 +110,11 @@
     ;; from the cached data set the vars
     (hash-table-for-each
      vals
      (lambda (key val)
        (debug:print 2 "setenv " key " " val)
-       (if (and (string? key)
-		(string? val))
-	   (setenv key val)
-	   (debug:print 0 "ERROR: Malformed environment variable definition: var=" var ", val=" val))))
+       (safe-setenv key val)))
     (if (not (get-environment-variable "MT_TARGET"))(setenv "MT_TARGET" target))
     (alist->env-vars (hash-table-ref/default *configdat* "env-override" '()))
     ;; Lets use this as an opportunity to put MT_RUNNAME in the environment
     (let ((runname  (if inrunname inrunname (rmt:get-run-name-from-id run-id))))
       (if runname
@@ -1154,11 +1151,11 @@
 	 (if (> (- (current-seconds)(+ (db:test-get-event_time testdat)
 				       (db:test-get-run_duration testdat)))
 		600) ;; i.e. no update for more than 600 seconds
 	     (begin
 	       (debug:print 0 "WARNING: Test " test-name " appears to be dead. Forcing it to state INCOMPLETE and status STUCK/DEAD")
-	       (tests:test-set-status! test-id "INCOMPLETE" "STUCK/DEAD" "Test is stuck or dead" #f))
+	       (tests:test-set-status! run-id test-id "INCOMPLETE" "STUCK/DEAD" "Test is stuck or dead" #f))
 	     (debug:print 2 "NOTE: " test-name " is already running")))
 	(else      
 	 (debug:print 0 "ERROR: Failed to launch test " full-test-name ". Unrecognised state " (test:get-state testdat))
 	 (case (string->symbol (test:get-state testdat)) 
 	   ((COMPLETED INCOMPLETE)