Index: db.scm
==================================================================
--- db.scm
+++ db.scm
@@ -1081,13 +1081,18 @@
        (case option
 	 ;; kill servers
 	 ((killservers)
 	  (for-each
 	   (lambda (server)
-	     (match-let (((mod-time host port start-time pid) server))
+             (handle-exceptions
+             exn
+             (begin 
+               (debug:print-info 0 *default-log-port*  "Unable to get host and/or port from " servr ", exn=" exn)     
+               #f)
+	     (match-let (((mod-time host port start-time server-id pid) server))
 	       (if (and host pid)
-		   (tasks:kill-server host pid))))
+		   (tasks:kill-server host pid)))))
 	   servers)
 
           ;; /tmp/bjbarcla/megatest_localdb/fullrun/.nfs.pdx.disks.icf_env_disk001.bjbarcla.gwa.issues.mtdev.matt-bisect.megatest.ext-tests.runs.all.v1.65.1.6524.dev.bb-24-justrollup-f8.rollup.fullrun/megatest.db.lock
           (delete-file* (common:get-sync-lock-filepath))
           )

Index: megatest-version.scm
==================================================================
--- megatest-version.scm
+++ megatest-version.scm
@@ -18,6 +18,6 @@
 ;; Always use two or four digit decimal
 ;; 1.01, 1.02...1.10,1.11,1.1101 ... 1.99,2.00..
 
 ;; (declare (unit megatest-version))
 
-(define megatest-version 1.6581)
+(define megatest-version 1.6582)

Index: server.scm
==================================================================
--- server.scm
+++ server.scm
@@ -464,11 +464,11 @@
   (handle-exceptions
     exn
     (begin 
       (debug:print-info 0 *default-log-port*  "Unable to get host and/or port from " servr ", exn=" exn)     
     #f)
-  (match-let (((mod-time hostname port start-time pid)
+  (match-let (((mod-time hostname port start-time server-id pid)
 	       servr))
     (tasks:kill-server hostname pid))))
 
 ;; called in megatest.scm, host-port is string hostname:port
 ;;

Index: sretrieve.scm
==================================================================
--- sretrieve.scm
+++ sretrieve.scm
@@ -697,11 +697,12 @@
                  ;;do nothing for dirs)
                  ) 
                 (else 
                                         
                      (if (not (string-match (regexp exclude)  p ))
-                        (print (string-substitute (conc base_path "/") "" p "-"))))))))
+                        (print (string-substitute (conc base_path "/") "" p "-"))))))
+         dotfiles: #t))
 
 (define (sretrieve:shell-help)
 (conc "Usage: " *exe-name* " [action [params ...]]
 
   ls    [target path]               	  : list contents of target area. The output of the cmd can be piped into other system cmd. eg ls <path> | grep txt
@@ -1081,12 +1082,12 @@
 (define (main)
   (let* ((args      (argv))
 	 (prog      (car args))
 	 (rema      (cdr args))
 	 (exe-name  (pathname-file (car (argv))))
-	 (exe-dir   (or (pathname-directory prog)
-			(sretrieve:find exe-name (string-split (get-environment-variable "PATH") ":"))))
+	 ;(exe-dir   (or (pathname-directory prog)
+	;		(sretrieve:find exe-name (string-split (get-environment-variable "PATH") ":"))))
 	 ;(configdat (sretrieve:load-config exe-dir exe-name))
 )
     ;; preserve the exe data in the config file
     ;(hash-table-set! configdat "exe-info" (list (list "exe-name" exe-name)
 					;	(list "exe-dir"  exe-dir)))