Index: archive.scm
==================================================================
--- archive.scm
+++ archive.scm
@@ -133,11 +133,11 @@
 	      (run-id            (db:test-get-run_id    test-dat))
 	      (target            (string-intersperse (map cadr (rmt:get-key-val-pairs run-id)) "/"))
 	      
 	      (toplevel/children (and (db:test-get-is-toplevel test-dat)
 				      (> (rmt:test-toplevel-num-items run-id test-name) 0)))
-	      (test-partial-path (conc target "/" run-name "/" (runs:make-full-test-name test-name item-path)))
+	      (test-partial-path (conc target "/" run-name "/" (db:test-make-full-name test-name item-path)))
 	      ;; note the trailing slash to get the dir inspite of it being a link
 	      (test-path         (conc linktree "/" test-partial-path))
 	      (test-physical-path (if (file-exists? test-path) (read-symbolic-link test-path #t) #f))
 	      (partial-path-index (if test-physical-path (substring-index test-partial-path test-physical-path) #f))
 	      (test-base         (if (and partial-path-index 
@@ -217,11 +217,11 @@
 	      (keyvals           (rmt:get-key-val-pairs run-id))
 	      (target            (string-intersperse (map cadr keyvals) "/"))
 	      
 	      (toplevel/children (and (db:test-get-is-toplevel test-dat)
 				      (> (rmt:test-toplevel-num-items run-id test-name) 0)))
-	      (test-partial-path (conc target "/" run-name "/" (runs:make-full-test-name test-name item-path)))
+	      (test-partial-path (conc target "/" run-name "/" (db:test-make-full-name test-name item-path)))
 	      ;; note the trailing slash to get the dir inspite of it being a link
 	      (test-path         (conc linktree "/" test-partial-path))
 	      ;; if the old path was not deleted then prev-test-physical-path will end up pointing to a real directory
 	      (prev-test-physical-path (if (file-exists? test-path) (read-symbolic-link test-path #t) #f))
 

Index: runs.scm
==================================================================
--- runs.scm
+++ runs.scm
@@ -1583,15 +1583,16 @@
 				(let ((new-tests (proc-get-tests run-id)))
 				  (if (null? new-tests)
 				      (debug:print-info 1 "Run completed according to zero tests matching provided criteria.")
 				      (loop (car new-tests)(cdr new-tests)))))
 			       ((archive)
-				(if (not toplevel-with-children)
-				    (case (string->symbol (args:get-arg "-archive"))
-				      ((save save-remove keep-html)
-				       (debug:print-info 0 "Estimating disk space usage for " test-fulln)
-				       (debug:print-info 0 "   " (common:get-disk-space-used (conc run-dir "/"))))))
+				(if (and run-dir (not toplevel-with-children))
+				    (let ((ddir (conc run-dir "/")))
+				      (case (string->symbol (args:get-arg "-archive"))
+					((save save-remove keep-html)
+					 (if (file-exists? ddir)
+					     (debug:print-info 0 "Estimating disk space usage for " test-fulln ": " (common:get-disk-space-used ddir)))))))
 				(if (not (null? tal))
 				    (loop (car tal)(cdr tal))))
 			       )))
 		       )
 		     (if worker-thread (thread-join! worker-thread))))))