@@ -1471,11 +1471,11 @@
 		    (debug:print 1 "Printing info for run " runkey ", run=" run ", tests=" tests ", header=" header)
 		    action)
 		   ((run-wait)
 		    (debug:print 1 "Waiting for run " runkey ", run=" runnamepatt " to complete"))
 		   ((archive)
-		    (debug:print 1 "Archiving data for run: " runkey " " (db:get-value-by-header run header "runname"))
+		    (debug:print 1 "Archiving/restoring (" (args:get-arg "-archive") ") data for run: " runkey " " (db:get-value-by-header run header "runname"))
 		    (set! worker-thread (make-thread (lambda ()
 						       (case (string->symbol (args:get-arg "-archive"))
 							 ((save save-remove keep-html)(archive:run-bup (args:get-arg "-archive") run-id run-name tests))
 							 ((restore)(archive:bup-restore (args:get-arg "-archive") run-id run-name tests))
 							 (else (debug:print 0 "ERROR: unrecognised sub command to -archive. Run \"megatest\" to see help"))))
@@ -1484,17 +1484,19 @@
 		   (else
 		    (debug:print-info 0 "action not recognised " action)))
 		 
 		 ;; actions that operate on one test at a time can be handled below
 		 ;;
-		 (let ((sorted-tests     (sort tests (lambda (a b)(let ((dira ;; (rmt:sdb-qry 'getstr 
-									 (db:test-get-rundir a)) ;; )  ;; (filedb:get-path *fdb* (db:test-get-rundir a)))
-									(dirb ;; (rmt:sdb-qry 'getstr 
-									 (db:test-get-rundir b))) ;; ) ;; ((filedb:get-path *fdb* (db:test-get-rundir b))))
-								    (if (and (string? dira)(string? dirb))
-									(> (string-length dira)(string-length dirb))
-									#f)))))
+		 (let ((sorted-tests     (filter 
+					  vector?
+					  (sort tests (lambda (a b)(let ((dira ;; (rmt:sdb-qry 'getstr 
+									  (db:test-get-rundir a)) ;; )  ;; (filedb:get-path *fdb* (db:test-get-rundir a)))
+									 (dirb ;; (rmt:sdb-qry 'getstr 
+									  (db:test-get-rundir b))) ;; ) ;; ((filedb:get-path *fdb* (db:test-get-rundir b))))
+								     (if (and (string? dira)(string? dirb))
+									 (> (string-length dira)(string-length dirb))
+									 #f))))))
 		       (toplevel-retries (make-hash-table)) ;; try three times to loop through and remove top level tests
 		       (test-retry-time  (make-hash-table))
 		       (allow-run-time   10)) ;; seconds to allow for killing tests before just brutally killing 'em
 		   (let loop ((test (car sorted-tests))
 			      (tal  (cdr sorted-tests)))