@@ -1294,11 +1294,11 @@
 ;; Roll up test_data pass/fail results
 ;; look at the test_data status field, 
 ;;    if all are pass (any case) and the test status is PASS or NULL or '' then set test status to PASS.
 ;;    if one or more are fail (any case) then set test status to PASS, non "pass" or "fail" are ignored
 (define (db:test-data-rollup db test-id status)
-  (let ((tdb (db:open-test-db-by-test-id db test-id))
+  (let ((tdb (open-run-close db:open-test-db-by-test-id db test-id))
 	(fail-count 0)
 	(pass-count 0))
     (if tdb
 	(begin
 	  (sqlite3:for-each-row
@@ -1314,11 +1314,11 @@
 	  ;; Now rollup the counts to the central megatest.db
 	  (rdb:pass-fail-counts test-id fail-count pass-count)
 	  ;; (sqlite3:execute db "UPDATE tests SET fail_count=?,pass_count=? WHERE id=?;" 
 	  ;;                     fail-count pass-count test-id)
 
-	  (thread-sleep! 1) ;; play nice with the queue by ensuring the rollup is at least one second later than the set
+	  (thread-sleep! 0.01) ;; play nice with the queue by ensuring the rollup is at least 10ms later than the set
 	  
 	  ;; if the test is not FAIL then set status based on the fail and pass counts.
 	  (rdb:test-rollup-iterated-pass-fail test-id)
 	  ;; (sqlite3:execute
 	  ;;  db   ;;; NOTE: Should this be WARN,FAIL? A WARN is not a FAIL????? BUG FIXME
@@ -1630,11 +1630,18 @@
 
 (define (rdb:test-set-status-state test-id status state msg)
   (if *runremote*
       (let ((host (vector-ref *runremote* 0))
 	    (port (vector-ref *runremote* 1)))
-	((rpc:procedure 'cdb:test-set-status-state host port) test-id status state msg))
+	(handle-exceptions
+	 exn
+	 (begin
+	   (debug:print 0 "EXCEPTION: rpc call failed?")
+	   (debug:print 0 "  " ((condition-property-accessor 'exn 'message) exn))
+	   (print-call-chain)
+	   (cdb:test-set-status-state test-id status state msg))
+	 ((rpc:procedure 'cdb:test-set-status-state host port) test-id status state msg)))
       (cdb:test-set-status-state test-id status state msg)))
 
 (define (rdb:test-rollup-iterated-pass-fail test-id)
   (if *runremote*
       (let ((host (vector-ref *runremote* 0))