Index: client.scm
==================================================================
--- client.scm
+++ client.scm
@@ -70,10 +70,14 @@
 	hostinfo ;; have hostinfo - just return it
 	(let* ((hostinfo  (open-run-close tasks:get-server tasks:open-db run-id))
 	       (transport (if hostinfo 
 			      (string->symbol (tasks:hostinfo-get-transport hostinfo))
 			      'http)))
+	  (if (not hostinfo)
+	      (begin
+		(debug:print 0 "ERROR: Expected to be able to connect to a server by now. No server available for run-id = " run-id)
+		(exit 1)))
 	  (hash-table-set! *runremote* run-id hostinfo)
 	  (debug:print-info 11 "CLIENT SETUP, hostinfo=" hostinfo)
 	  (debug:print-info 11 "Using transport type of " transport (if hostinfo (conc " to connect to " hostinfo) ""))
 	  (case *transport-type* 
 	    ;; ((fs)(if (not *megatest-db*)(set! *megatest-db* (open-db))))

Index: db.scm
==================================================================
--- db.scm
+++ db.scm
@@ -828,12 +828,13 @@
 
 
 ;; register a test run with the db, this accesses the main.db and does NOT
 ;; use server api
 ;;
-(define (db:register-run db keyvals runname state status user)
-  (let* ((keys      (map car keyvals))
+(define (db:register-run dbstruct keyvals runname state status user)
+  (let* ((db        (db:get-db dbstruct #f))
+	 (keys      (map car keyvals))
 	 (keystr    (keys->keystr keys))	 
 	 (comma     (if (> (length keys) 0) "," ""))
 	 (andstr    (if (> (length keys) 0) " AND " ""))
 	 (valslots  (keys->valslots keys)) ;; ?,?,? ...
 	 (allvals   (append (list runname state status user) (map cadr keyvals)))