@@ -106,17 +106,27 @@
 			     (let ((var (car varval))
 				   (val (cadr varval)))
 			       (debug:print 1 "Adding pre-var/val " var " = " val " to the environment")
 			       (setenv var val)))))
 		     varpairs)))
-	  (setenv "MT_TEST_RUN_DIR" work-area)
-	  (setenv "MT_TEST_NAME" test-name)
-	  (setenv "MT_ITEM_INFO" (conc itemdat))
-	  (setenv "MT_RUNNAME"   runname)
-	  (setenv "MT_MEGATEST"  megatest)
-	  (setenv "MT_TARGET"    target)
-	  (setenv "MT_LINKTREE"  (configf:lookup *configdat* "setup" "linktree"))
+	  (for-each
+	   (lambda (varval)
+	     (let ((var (car varval))
+		   (val (cadr varval)))
+	       (if val
+		   (setenv var val)
+		   (begin
+		     (debug:print 0 "ERROR: required variable " var " does not have a valid value. Exiting")
+		     (exit)))))
+	     (list 
+	      (list  "MT_TEST_RUN_DIR" work-area)
+	      (list  "MT_TEST_NAME" test-name)
+	      (list  "MT_ITEM_INFO" (conc itemdat))
+	      (list  "MT_RUNNAME"   runname)
+	      (list  "MT_MEGATEST"  megatest)
+	      (list  "MT_TARGET"    target)
+	      (list  "MT_LINKTREE"  (configf:lookup *configdat* "setup" "linktree"))))
 	  (if mt-bindir-path (setenv "PATH" (conc (getenv "PATH") ":" mt-bindir-path)))
 	  ;; (change-directory top-path)
 	  (if (not (setup-for-run))
 	      (begin
 		(debug:print 0 "Failed to setup, exiting")