@@ -78,11 +78,11 @@
 	 (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))
 	 (thread-sleep! 30)
 	 (lock-queue:set-state dbdat test-id newstate remtries: (- remtries 1)))
        (begin
-	 (debug:print 0 *default-log-port* "ERROR:  Failed to set lock state for test with id " test-id ", error: " ((condition-property-accessor 'exn 'message) exn) ", giving up.")
+	 (debug:print-error 0 *default-log-port* " Failed to set lock state for test with id " test-id ", error: " ((condition-property-accessor 'exn 'message) exn) ", giving up.")
 	 #f))
    (sqlite3:execute (lock-queue:db-dat-get-db dbdat) "UPDATE queue SET state=? WHERE test_id=?;"
 		    newstate
 		    test-id)))
 
@@ -97,11 +97,11 @@
 	 (debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn))
 	 (thread-sleep! 5)
          (lock-queue:delete-lock-db dbdat)
 	 (lock-queue:any-younger? dbdat mystart test-id remtries: (- remtries 1)))
        (begin
-	 (debug:print 0 *default-log-port* "ERROR:  Failed to find younger locks for test with id " test-id ", error: " ((condition-property-accessor 'exn 'message) exn) ", giving up.")
+	 (debug:print-error 0 *default-log-port* " Failed to find younger locks for test with id " test-id ", error: " ((condition-property-accessor 'exn 'message) exn) ", giving up.")
 	 #f))
    (let ((res #f))
      (sqlite3:for-each-row
       (lambda (tid)
 	;; Actually this should not be needed as mystart cannot be simultaneously less than and test-id same as