@@ -90,15 +90,15 @@
 ;; keeping it around for debugging purposes only
 (define (open-run-close-no-exception-handling  proc idb . params)
   (debug:print-info 11 "open-run-close-no-exception-handling START given a db=" (if idb "yes " "no ") ", params=" params)
   (if (or *db-write-access*
 	  (not (member proc *db:all-write-procs*)))
-      (let* ((db   (if idb 
-		       (if (procedure? idb)
-			   (idb)
-			   idb)
-		       (open-db)))
+      (let* ((db   (cond
+		    ((sqlite3:database? idb) idb)
+		    ((not idb)               (open-db))
+		    ((procedure? idb)       (idb))
+		    (else   	            (open-db))))
 	     (res #f))
 	(set! res (apply proc db params))
 	(if (not idb)(sqlite3:finalize! db))
 	(debug:print-info 11 "open-run-close-no-exception-handling END" )
 	res)
@@ -1914,11 +1914,11 @@
 	;; hand queries off to the write queue
 	(let ((response (case *transport-type*
 			  ((http)
 			   (debug:print-info 7 "Queuing item " item " for wrapped write")
 			   (db:queue-write-and-wait db qry-sig query params))
-			  (else  
+			  (else 
 			   (apply sqlite3:execute db query params)
 			   #t))))
 	  (debug:print-info 7 "Received " response " from wrapped write")
 	  (server:reply return-address qry-sig response response))
 	;; otherwise if appropriate flush the queue (this is a read or complex query)
@@ -2168,18 +2168,19 @@
     (if (sqlite3:database? tdb)
 	(handle-exceptions
 	 exn
 	 (debug:print 0 "ERROR: error on access to testdat for test with id " test-id)
 	 '()
-	 (sqlite3:for-each-row 
-	  (lambda (id test-id stepname state status event-time logfile)
-	    (set! res (cons (vector id test-id stepname state status event-time (if (string? logfile) logfile "")) res)))
-	  tdb
-	  "SELECT id,test_id,stepname,state,status,event_time,logfile FROM test_steps WHERE test_id=? ORDER BY id ASC;" ;; event_time DESC,id ASC;
-	  test-id)
-	 (sqlite3:finalize! tdb)
-	 (reverse res))
+	 (begin
+	   (sqlite3:for-each-row 
+	    (lambda (id test-id stepname state status event-time logfile)
+	      (set! res (cons (vector id test-id stepname state status event-time (if (string? logfile) logfile "")) res)))
+	    tdb
+	    "SELECT id,test_id,stepname,state,status,event_time,logfile FROM test_steps WHERE test_id=? ORDER BY id ASC;" ;; event_time DESC,id ASC;
+	    test-id)
+	   (sqlite3:finalize! tdb)
+	   (reverse res)))
 	'())))
 
 ;; get a pretty table to summarize steps
 ;;
 (define (db:get-steps-table db test-id #!key (work-area #f))