@@ -558,22 +558,22 @@
 		 (sid        (if killinfo (if (substring-index ":" killinfo) #f (string->number killinfo)) #f)))
 	    (format #t fmtstr "Id" "MTver" "Pid" "Host" "Interface:OutPort" "InPort" "LastBeat" "State" "Transport")
 	    (format #t fmtstr "==" "=====" "===" "====" "=================" "======" "========" "=====" "=========")
 	    (for-each 
 	     (lambda (server)
-	       (let* ((id         (vector-ref server 0))
-		      (pid        (vector-ref server 1))
-		      (hostname   (vector-ref server 2))
-		      (interface  (vector-ref server 3)) 
-		      (pullport   (vector-ref server 4))
-		      (pubport    (vector-ref server 5))
-		      (start-time (vector-ref server 6))
-		      (priority   (vector-ref server 7))
-		      (state      (vector-ref server 8))
-		      (mt-ver     (vector-ref server 9))
-		      (last-update (vector-ref server 10)) 
-		      (transport  (vector-ref server 11))
+	       (let* ((id         (safe-vector-ref server 0))
+		      (pid        (safe-vector-ref server 1))
+		      (hostname   (safe-vector-ref server 2))
+		      (interface  (safe-vector-ref server 3)) 
+		      (pullport   (safe-vector-ref server 4))
+		      (pubport    (safe-vector-ref server 5))
+		      (start-time (safe-vector-ref server 6))
+		      (priority   (safe-vector-ref server 7))
+		      (state      (safe-vector-ref server 8))
+		      (mt-ver     (safe-vector-ref server 9))
+		      (last-update (safe-vector-ref server 10)) 
+		      (transport  (safe-vector-ref server 11))
 		      (killed     #f)
 		      (status     (< last-update 20)))
 		 ;;   (zmq-sockets (if status (server:client-connect hostname port) #f)))
 		 ;; no need to login as status of #t indicates we are connecting to correct 
 		 ;; server
@@ -726,17 +726,17 @@
      "set run status"
      (lambda (target runname keys keyvals)
        (let* ((runsdat  (rmt:get-runs-by-patt keys runname 
 					(common:args-get-target)
 					#f #f))
-	      (header   (vector-ref runsdat 0))
-	      (rows     (vector-ref runsdat 1)))
+	      (header   (safe-vector-ref runsdat 0))
+	      (rows     (safe-vector-ref runsdat 1)))
 	 (if (null? rows)
 	     (begin
 	       (debug:print-info 0 "No matching run found.")
 	       (exit 1))
-	     (let* ((row      (car (vector-ref runsdat 1)))
+	     (let* ((row      (car (safe-vector-ref runsdat 1)))
 		    (run-id   (db:get-value-by-header row header "id")))
 	       (if (args:get-arg "-set-run-status")
 		   (rmt:set-run-status run-id (args:get-arg "-set-run-status") msg: (args:get-arg "-m"))
 		   (print (rmt:get-run-status run-id))
 		   )))))))