diff --git a/beautiful-racket-lib/br/debug.rkt b/beautiful-racket-lib/br/debug.rkt
index c4f2016..53a8074 100644
--- a/beautiful-racket-lib/br/debug.rkt
+++ b/beautiful-racket-lib/br/debug.rkt
@@ -5,19 +5,21 @@
 (define-macro-cases report
   [(_ EXPR) #'(report EXPR EXPR)]
   [(_ EXPR NAME)
-   #'(let ([expr-result EXPR]) 
+   #'(let ([expr-result EXPR])
        (eprintf "~a = ~v\n" 'NAME expr-result)
        expr-result)])
 
 (define-macro-cases report-datum
   [(_ STX-EXPR) #`(report-datum STX-EXPR #,(syntax->datum #'STX-EXPR))]
   [(_ STX-EXPR NAME)
-   #'(let () 
-       (eprintf "~a = ~v\n" 'NAME (syntax->datum STX-EXPR))
-       STX-EXPR)])
+   #'(let ([stx STX-EXPR])
+       (eprintf "~a = ~v\n" 'NAME (if (eof-object? stx)
+                                      stx
+                                      (syntax->datum stx)))
+       stx)])
 
 (define-macro (define-multi-version MULTI-NAME NAME)
   #'(define-macro (MULTI-NAME X (... ...))
       #'(begin (NAME X) (... ...))))
 
-(define-multi-version report* report)
\ No newline at end of file
+(define-multi-version report* report)