@@ -36,34 +36,38 @@
 	   (begin
 	     (thread-sleep! 10)
 	     (if (> count 0)
 		 (lock-queue:open-db fname count: (- count 1))
 		 db))
-	   (sqlite3:execute 
-	    db
-	    "CREATE TABLE IF NOT EXISTS queue (
-  	      id         INTEGER PRIMARY KEY,
-              test_id    INTEGER,
-              start_time INTEGER,
-              state      TEXT,
-              CONSTRAINT queue_constraint UNIQUE (test_id));")
-	   (sqlite3:execute
-	    db
-	    "CREATE TABLE IF NOT EXISTS runlocks (
-              id         INTEGER PRIMARY KEY,
-              test_id    INTEGER,
-              run_lock   TEXT,
-              CONSTRAINT runlock_constraint UNIQUE (run_lock));"))))
+	   (sqlite3:with-transaction
+	    db
+	    (lambda ()
+	      (sqlite3:execute 
+	       db
+	       "CREATE TABLE IF NOT EXISTS queue (
+     	         id         INTEGER PRIMARY KEY,
+                 test_id    INTEGER,
+                 start_time INTEGER,
+                 state      TEXT,
+                 CONSTRAINT queue_constraint UNIQUE (test_id));")
+	      (sqlite3:execute
+	       db
+	       "CREATE TABLE IF NOT EXISTS runlocks (
+                 id         INTEGER PRIMARY KEY,
+                 test_id    INTEGER,
+                 run_lock   TEXT,
+                 CONSTRAINT runlock_constraint UNIQUE (run_lock));"))))))
     (sqlite3:set-busy-handler! db handler)
     db))
 
 (define (lock-queue:set-state db test-id newstate #!key (remtries 10))
   (handle-exceptions
    exn
    (if (> remtries 0)
        (begin
 	 (debug:print 0 "WARNING: exception on lock-queue:set-state. Trying again in 30 seconds.")
+	 (debug:print 0 " message: " ((condition-property-accessor 'exn 'message) exn))
 	 (thread-sleep! 30)
 	 (lock-queue:set-state db test-id newstate remtries: (- remtries 1)))
        (begin
 	 (debug:print 0 "ERROR:  Failed to set lock state for test with id " test-id ", error: " ((condition-property-accessor 'exn 'message) exn) ", giving up.")
 	 #f))
@@ -75,10 +79,11 @@
   (handle-exceptions
    exn
    (if (> remtries 0)
        (begin
 	 (debug:print 0 "WARNING: exception on lock-queue:any-younger. Trying again in 30 seconds.")
+	 (debug:print 0 " message: " ((condition-property-accessor 'exn 'message) exn))
 	 (thread-sleep! 30)
 	 (lock-queue:any-younger? db mystart test-id remtries: (- remtries 1)))
        (begin
 	 (debug:print 0 "ERROR:  Failed to find younger locks for test with id " test-id ", error: " ((condition-property-accessor 'exn 'message) exn) ", giving up.")
 	 #f))
@@ -98,10 +103,12 @@
 	(mklckqry  (sqlite3:prepare db "INSERT INTO runlocks (test_id,run_lock) VALUES (?,'locked');")))
     (let ((result 
 	   (handle-exceptions
 	    exn
 	    (begin
+	      (debug:print 0 "WARNING: failed to get queue lock. Will try again in a few seconds")
+	      (debug:print 0 " message: " ((condition-property-accessor 'exn 'message) exn))
 	      (thread-sleep! 10)
 	      (if (> count 0)
 		  (lock-queue:get-lock db test-id count: (- count 1)))
 	      #f)
 	    (sqlite3:with-transaction
@@ -125,10 +132,12 @@
 (define (lock-queue:release-lock fname test-id #!key (count 10))
   (let ((db (lock-queue:open-db fname)))
     (handle-exceptions
      exn
      (begin
+       (debug:print 0 "WARNING: Failed to release queue lock. Will try again in few seconds")
+       (debug:print 0 " message: " ((condition-property-accessor 'exn 'message) exn))
        (thread-sleep! 10)
        (if (> count 0)
 	   (lock-queue:release-lock fname test-id count: (- count 1))
 	   #f))
      (sqlite3:execute db "DELETE FROM runlocks WHERE test_id=?;" test-id)
@@ -136,10 +145,12 @@
 
 (define (lock-queue:steal-lock db test-id #!key (count 10))
   (handle-exceptions
    exn
    (begin
+     (debug:print 0 "WARNING: Failed to steal queue lock. Will try again in few seconds")
+     (debug:print 0 " message: " ((condition-property-accessor 'exn 'message) exn))
      (thread-sleep! 10)
      (if (> count 0)
 	 (lock-queue:steal-lock db test-id count: (- count 1))
 	 #f))
    (sqlite3:execute db "DELETE FROM runlocks WHERE run_lock='locked';"))
@@ -153,10 +164,12 @@
   (let ((db      (lock-queue:open-db fname))
 	(mystart (current-seconds)))
     (handle-exceptions
      exn
      (begin
+       (debug:print 0 "WARNING: Failed to find out if it is ok to skip the wait queue. Will try again in few seconds")
+       (debug:print 0 " message: " ((condition-property-accessor 'exn 'message) exn))
        (thread-sleep! 10)
        (if (> count 0)
 	   (lock-queue:wait-turn fname test-id count: (- count 1))
 	   #f))
      (sqlite3:execute