@@ -26,13 +26,27 @@
 (define-syntax define-simple-syntax
   (syntax-rules ()
     ((_ (name arg ...) body ...)
      (define-syntax name (syntax-rules () ((name arg ...) (begin body ...)))))))
 
+;; (define-syntax common:handle-exceptions
+;;   (syntax-rules ()
+;;     ((_ exn-in errstmt ...)(common:debug-handle-exceptions #t exn-in errstmt ...))))
+
+(define-syntax common:debug-handle-exceptions
+  (syntax-rules ()
+    ((_ debug exn errstmt body ...)
+     (if debug
+	 (begin body ...)
+	 (handle-exceptions exn errstmt body ...)))))
+
 (define-syntax common:handle-exceptions
   (syntax-rules ()
-    ((_ exn-in errstmt ...)(handle-exceptions exn-in errstmt ...))))
+    ((_ exn errstmt body ...)
+     (begin body ...))))
+
+;; (define handle-exceptions common:handle-exceptions)
 
 ;; iup callbacks are not dumping the stack, this is a work-around
 ;;
 (define-simple-syntax (debug:catch-and-dump proc procname)
   (handle-exceptions
@@ -97,11 +111,11 @@
 	 (list? n))
     (not (null? (lset-intersection! eq? *verbosity* n))))
    ((and (number? *verbosity*)
 	 (list? n))
     (member *verbosity* n))))
-      
+
 (define (debug:setup)
   (let ((debugstr (or (args:get-arg "-debug")
 		      (getenv "MT_DEBUG_MODE"))))
     (set! *verbosity* (debug:calc-verbosity debugstr))
     (debug:check-verbosity *verbosity* debugstr)