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: 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
 ;;