Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -923,10 +923,21 @@
     (let ((tl        (launch:setup))
           (transport-type (string->symbol (or (args:get-arg "-transport") "http"))))
       (server:launch 0 transport-type)
       (set! *didsomething* #t)))
 
+
+(define (naylist->alist inlst)
+  (map (lambda (dat)
+	 (cons (car dat)
+	       (or (if (list?   (cdr dat))
+		       (if (null? (cdr dat)) ""
+			   (cadr dat))
+		       (cdr dat))
+		   ""))) ;; we need a string for call-with-environment-variables
+       inlst))
+
 ;; The adjutant is a bit different, it does NOT run (launch:setup) as it is not necessarily tied to
 ;; a specific Megatest area. Detail are being hashed out and this may change.
 ;;
 (if (args:get-arg "-adjutant")
     (let* ((host-type (args:get-arg "-adjutant")))
@@ -940,11 +951,11 @@
 		      (let ((vars-alist (with-input-from-string vars read)
 					))
 			(print "Vars:")
 			(pp vars-alist)
 			(call-with-environment-variables
-			 vars-alist
+			 (naylist->alist vars-alist)
 			 (lambda ()
 			   (system cmdline))))
 		      (loop 0))
 		  (else
 		   (thread-sleep! 10)