@@ -39,11 +39,11 @@
 	 (db       (sqlite3:open-database actualfname))
 	 (handler  (make-busy-timeout 136000)))
     (if dbexists
 	(vector db actualfname)
 	(begin
-	  (handle-exceptions
+	  (common:debug-handle-exceptions #t
 	   exn
 	   (begin
 	     (thread-sleep! 10)
 	     (if (> count 0)
 		 (lock-queue:open-db fname count: (- count 1))
@@ -69,11 +69,11 @@
     (sqlite3:set-busy-handler! db handler)
     (vector db actualfname)))
 
 (define (lock-queue:set-state dbdat test-id newstate #!key (remtries 10))
   (tasks:wait-on-journal (lock-queue:db-dat-get-path dbdat) 1200)
-  (handle-exceptions
+  (common:debug-handle-exceptions #t
    exn
    (if (> remtries 0)
        (begin
 	 (debug:print 0 *default-log-port* "WARNING: exception on lock-queue:set-state. Trying again in 30 seconds.")
 	 (debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn))
@@ -87,11 +87,11 @@
 		    test-id)))
 
 (define (lock-queue:any-younger? dbdat mystart test-id #!key (remtries 10))
   ;; no need to wait on journal on read only queries
   ;; (tasks:wait-on-journal (lock-queue:db-dat-get-path dbdat) 1200)
-  (handle-exceptions
+  (common:debug-handle-exceptions #t
    exn
    (if (> remtries 0)
        (begin
 	 (debug:print 0 *default-log-port* "WARNING: exception on lock-queue:any-younger. Removing lockdb and trying again in 5 seconds.")
 	 (debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn))
@@ -116,11 +116,11 @@
   (let* ((res       #f)
 	 (db        (lock-queue:db-dat-get-db dbdat))
 	 (lckqry    (sqlite3:prepare db "SELECT test_id,run_lock FROM runlocks WHERE run_lock='locked';"))
 	 (mklckqry  (sqlite3:prepare db "INSERT INTO runlocks (test_id,run_lock) VALUES (?,'locked');")))
     (let ((result 
-	   (handle-exceptions
+	   (common:debug-handle-exceptions #t
 	    exn
 	    (begin
 	      (debug:print 0 *default-log-port* "WARNING: failed to get queue lock. Removing lock db and returning fail") ;; Will try again in a few seconds")
 	      (debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn))
 	      (thread-sleep! 10)
@@ -148,11 +148,11 @@
       result)))
 
 (define (lock-queue:release-lock fname test-id #!key (count 10))
   (let* ((dbdat (lock-queue:open-db fname)))
     (tasks:wait-on-journal (lock-queue:db-dat-get-path dbdat) 1200 "lock-queue:release-lock; waiting on journal")
-    (handle-exceptions
+    (common:debug-handle-exceptions #t
      exn
      (begin
        (debug:print 0 *default-log-port* "WARNING: Failed to release queue lock. Will try again in few seconds")
        (debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn))
        (thread-sleep! (/ count 10))
@@ -161,11 +161,11 @@
 	     (sqlite3:finalize! (lock-queue:db-dat-get-db dbdat))
 	     (lock-queue:release-lock fname test-id count: (- count 1)))
 	   (let ((journal (conc fname "-journal")))
 	     ;; If we've tried ten times and failed there is a serious problem
 	     ;; try to remove the lock db and allow it to be recreated
-	     (handle-exceptions
+	     (common:debug-handle-exceptions #t
 	      exn
 	      #f
 	      (if (file-exists? journal)(delete-file journal))
 	      (if (file-exists? fname)  (delete-file fname))
 	      #f))))
@@ -173,11 +173,11 @@
      (sqlite3:finalize! (lock-queue:db-dat-get-db dbdat)))))
 
 (define (lock-queue:steal-lock dbdat test-id #!key (count 10))
   (debug:print-info 0 *default-log-port* "Attempting to steal lock at " (lock-queue:db-dat-get-path dbdat))
   (tasks:wait-on-journal (lock-queue:db-dat-get-path dbdat) 1200 "lock-queue:steal-lock; waiting on journal")
-  (handle-exceptions
+  (common:debug-handle-exceptions #t
    exn
    (begin
      (debug:print 0 *default-log-port* "WARNING: Failed to steal queue lock. Will try again in few seconds")
      (debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn))
      (thread-sleep! 10)
@@ -194,11 +194,11 @@
 (define (lock-queue:wait-turn fname test-id #!key (count 10)(waiting-msg #f))
   (let* ((dbdat   (lock-queue:open-db fname))
 	 (mystart (current-seconds))
 	 (db      (lock-queue:db-dat-get-db dbdat)))
     ;; (tasks:wait-on-journal (lock-queue:db-dat-get-path dbdat) 1200 waiting-msg: "lock-queue:wait-turn; waiting on journal file")
-    (handle-exceptions
+    (common:debug-handle-exceptions #t
      exn
      (begin
        (debug:print 0 *default-log-port* "WARNING: Failed to find out if it is ok to skip the wait queue. Will try again in few seconds")
        (debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn))
        (print-call-chain (current-error-port))