Index: common.scm
==================================================================
--- common.scm
+++ common.scm
@@ -643,13 +643,10 @@
 ;; dot-locking egg seems not to work, using this for now
 ;; if lock is older than expire-time then remove it and try again
 ;; to get the lock
 ;;
 (define (common:simple-file-lock fname #!key (expire-time 300))
-;  (handle-exceptions
-;      exn
-;      #f ;; don't really care what went wrong right now. NOTE: I have not seen this one actually fail.
     (if (common:file-exists? fname)
 	(if (> (- (current-seconds)(file-modification-time fname)) expire-time)
 	    (begin
 	      (delete-file* fname)
 	      (common:simple-file-lock fname expire-time: expire-time))
@@ -658,16 +655,16 @@
 	  (with-output-to-file fname
 	    (lambda ()
 	      (print key-string)))
 	  (thread-sleep! 0.25)
 	  (if (common:file-exists? fname)
-	      (with-input-from-file fname
-		(lambda ()
-		  (equal? key-string (read-line))))
-	      #f)))
-;    )
-  )
+	      (handle-exceptions exn
+                #f 
+                (with-input-from-file fname
+	  	  (lambda ()
+		    (equal? key-string (read-line)))))
+	      #f))))
 
 (define (common:simple-file-lock-and-wait fname #!key (expire-time 300))
   (let ((end-time (+ expire-time (current-seconds))))
     (let loop ((got-lock (common:simple-file-lock fname expire-time: expire-time)))
       (if got-lock