@@ -364,10 +364,19 @@
 	       (args:get-arg "-envcap")
 	       (args:get-arg "-envdelta")
 	       )
 	      ))
     (debug:print-error 0 *default-log-port* "Unrecognised arguments: " (string-intersperse (if (list? remargs) remargs (argv))  " ")))
+
+;; before doing anything else change to the start-dir if provided
+;;
+(if (args:get-arg "-start-dir")
+    (if (file-exists? (args:get-arg "-start-dir"))
+	(change-directory (args:get-arg "-start-dir"))
+	(begin
+	  (debug:print-error 0 *default-log-port* "non-existant start dir " (args:get-arg "-start-dir") " specified, exiting.")
+	  (exit 1))))
 
 ;; immediately set MT_TARGET if -reqtarg or -target are available
 ;;
 (let ((targ (or (args:get-arg "-reqtarg")(args:get-arg "-target"))))
   (if targ (setenv "MT_TARGET" targ)))
@@ -438,17 +447,10 @@
 	       (file-exists? manual-html))
 	  (system (conc "(" htmlviewercmd " " manual-html " ) &"))
 	  (system (conc "(" htmlviewercmd " http://www.kiatoa.com/cgi-bin/fossils/megatest/doc/tip/docs/manual/megatest_manual.html ) &")))
       (exit)))
 
-(if (args:get-arg "-start-dir")
-    (if (file-exists? (args:get-arg "-start-dir"))
-	(change-directory (args:get-arg "-start-dir"))
-	(begin
-	  (debug:print-error 0 *default-log-port* "non-existant start dir " (args:get-arg "-start-dir") " specified, exiting.")
-	  (exit 1))))
-
 (if (args:get-arg "-version")
     (begin
       (print (common:version-signature)) ;; (print megatest-version)
       (exit)))