diff --git a/collects/drscheme/private/debug.ss b/collects/drscheme/private/debug.ss
index 361a53b143..146189ade7 100644
--- a/collects/drscheme/private/debug.ss
+++ b/collects/drscheme/private/debug.ss
@@ -294,7 +294,8 @@ profile todo:
       (display-srclocs-in-error src-locs src-locs-edition)
       (display msg (current-error-port))
       (when (exn:fail:syntax? exn)
-        (show-syntax-error-context (current-error-port) exn))
+        (unless (error-print-source-location)
+          (show-syntax-error-context (current-error-port) exn)))
       (newline (current-error-port))
       (flush-output (current-error-port))
       (when (and rep
diff --git a/collects/drscheme/private/rep.ss b/collects/drscheme/private/rep.ss
index fc001adc6f..bf470c775f 100644
--- a/collects/drscheme/private/rep.ss
+++ b/collects/drscheme/private/rep.ss
@@ -1867,7 +1867,8 @@ TODO
                          (number? col))
                 (insert-file-name/icon src pos span line col))
               (insert/delta text (format "~a" (exn-message exn)) error-delta)
-              (when (syntax? expr)
+              (when (and (error-print-source-location)
+                         (syntax? expr))
                 (insert/delta text " in: ")
                 (insert/delta text (format "~s" (syntax->datum expr)) error-text-style-delta))
               (insert/delta text "\n")