@@ -2735,21 +2735,23 @@
     (*PI* xml "version='1.0'")
     (testsuite)))
 
 (define (runs:update-junit-test-reporter-xml run-id)
   (let*	(
-	 (junit-test-reporter	(configf:lookup *configdat* "runs" "junit-test-reporter-xml"))
+	 (junit-test-reporter	 (configf:lookup *configdat* "runs" "junit-test-reporter-xml"))
 	 (junit-test-report-dir  (configf:lookup *configdat* "runs" "junit-test-report-dir"))
-	 (xml-dir		(if (and junit-test-reporter (equal? junit-test-reporter "yes" ))
-				    (if junit-test-report-dir
-					junit-test-report-dir
-					(conc (getenv "MT_LINKTREE") "/" (getenv "MT_TARGET") "/" (getenv "MT_RUNNAME")))
-				    #f))
+	 (xml-dir		 (if (and junit-test-reporter (equal? junit-test-reporter "yes" ))
+				     (if junit-test-report-dir
+					 junit-test-report-dir
+					 (conc (getenv "MT_LINKTREE") "/" (getenv "MT_TARGET") "/" (getenv "MT_RUNNAME")))
+				     #f))
 	 (xml-ts-name		(if xml-dir
 				    (conc (getenv "MT_TESTSUITENAME")"."(string-translate (getenv "MT_TARGET") "/" ".") "." (getenv "MT_RUNNAME"))
 				    #f))
-         (keyname               (common:get-signature xml-ts-name))
+         (keyname               (if xml-ts-name
+				    (common:get-signature xml-ts-name)
+				    #f))
 	 (xml-path		(if xml-dir
 				    (conc xml-dir "/" keyname ".xml")
 				    #f))
 
 	 (test-data		(if xml-dir