Index: dbfile.scm
==================================================================
--- dbfile.scm
+++ dbfile.scm
@@ -326,11 +326,11 @@
 (define (dbfile:print-err . params)
   (with-output-to-port
       (current-error-port)
     (lambda ()
       (apply print params))))
-    
+
 (define (dbfile:cautious-open-database fname init-proc sync-mode journal-mode #!optional (tries-left 500))
   (let* ((busy-file  (conc fname "-journal"))
 	 (delay-time (* (- 51 tries-left) 1.1))
       	 (write-access (file-write-access? fname))
          (dir-access (file-write-access? (pathname-directory fname)))
@@ -1053,11 +1053,13 @@
     (with-output-to-file crumbn
       (lambda ()
 	(print fname" "run-id" "params)
 	))
     crumbn))
-  
+
+(define no-condition-db-with-db (make-parameter #t))
+
 ;; (db:with-db dbstruct run-id sqlite3:exec "select blah fgrom blaz;")
 ;; r/w is a flag to indicate if the db is modified by this query #t = yes, #f = no
 ;;
 (define (db:with-db dbstruct run-id r/w proc . params)
   (assert dbstruct "FATAL: db:with-db called with dbstruct "#f)
@@ -1071,11 +1073,21 @@
 			(dbr:dbdat-dbh dbdat)
 			dbstruct))
 	 (fname     (if dbdat
 			(dbr:dbdat-dbfile dbdat)
 			"nofilenameavailable"))
-	 (jfile     (conc fname"-journal")))
+	 (jfile     (conc fname"-journal"))
+	 (qryproc   (lambda ()
+		      (if use-mutex (mutex-lock! *db-with-db-mutex*))
+		      (let ((res (apply proc dbdat db params))) ;; the actual call is here.
+			(if use-mutex (mutex-unlock! *db-with-db-mutex*))
+			;; (if (vector? dbstruct)(db:done-with dbstruct run-id r/w))
+			(if dbdat
+			    (dbfile:add-dbdat dbstruct run-id dbdat))
+			;; (delete-file* crumbfile)
+			res))))
+
 	 ;; (crumbfile (dbfile:wait-for-qif fname run-id params)))
     (assert (sqlite3:database? db) "FATAL: db:with-db, db is not a database, db="db", fname="fname)
     (if (file-exists? jfile)
 	(begin
 	  (dbfile:print-err "INFO: "jfile" exists, delaying to reduce database load")
@@ -1082,31 +1094,25 @@
 	  (thread-sleep! 0.2)))
     (if (and use-mutex
 	     (common:low-noise-print 120 "over-50-parallel-api-requests"))
 	(dbfile:print-err *api-process-request-count* " parallel api requests being processed in process "
 			  (current-process-id))) ;;  ", throttling access"))
-    (condition-case
-	(begin
-	  (if use-mutex (mutex-lock! *db-with-db-mutex*))
-	  (let ((res (apply proc dbdat db params))) ;; the actual call is here.
-	    (if use-mutex (mutex-unlock! *db-with-db-mutex*))
-	    ;; (if (vector? dbstruct)(db:done-with dbstruct run-id r/w))
-	    (if dbdat
-		(dbfile:add-dbdat dbstruct run-id dbdat))
-	    ;; (delete-file* crumbfile)
-	    res))
-      (exn (io-error)
-	   (db:generic-error-printout exn "ERROR: i/o error with " fname ". Check permissions, disk space etc. and try again."))
-      (exn (corrupt)
-	   (db:generic-error-printout exn "ERROR: database " fname " is corrupt. Repair it to proceed."))
-      (exn (busy)
-	   (db:generic-error-printout exn "ERROR: database " fname
-				      " is locked. Try copying to another location, remove original and copy back."))
-      (exn (permission)(db:generic-error-printout exn "ERROR: database " fname " has some permissions problem."))
-      (exn ()
-	   (db:generic-error-printout exn "ERROR: Unknown error with database " fname " message: "
-				      ((condition-property-accessor 'exn 'message) exn))))))
+    (if (no-condition-db-with-db)
+	(qryproc)
+	(condition-case
+	 (qryproc)
+	 (exn (io-error)
+	      (db:generic-error-printout exn "ERROR: i/o error with " fname ". Check permissions, disk space etc. and try again."))
+	 (exn (corrupt)
+	      (db:generic-error-printout exn "ERROR: database " fname " is corrupt. Repair it to proceed."))
+	 (exn (busy)
+	      (db:generic-error-printout exn "ERROR: database " fname
+					 " is locked. Try copying to another location, remove original and copy back."))
+	 (exn (permission)(db:generic-error-printout exn "ERROR: database " fname " has some permissions problem."))
+	 (exn ()
+	      (db:generic-error-printout exn "ERROR: Unknown error with database " fname " message: "
+					 ((condition-property-accessor 'exn 'message) exn)))))))
 
 ;;======================================================================
 ;; another attempt at a transactionized queue
 ;;======================================================================