diff --git a/clisp/env.lisp b/clisp/env.lisp
index faa63cef..f339eee4 100644
--- a/clisp/env.lisp
+++ b/clisp/env.lisp
@@ -5,6 +5,7 @@
   (:export :undefined-symbol
            :mal-environment
            :get-env
+           :find-env
            :set-env))
 
 (in-package :env)
diff --git a/clisp/step8_macros.lisp b/clisp/step8_macros.lisp
index bc3250f0..4c88ce27 100644
--- a/clisp/step8_macros.lisp
+++ b/clisp/step8_macros.lisp
@@ -89,7 +89,7 @@
              (not (zerop (length (mal-data-value ast)))))
     (let* ((func-symbol (first (mal-data-value ast)))
            (func (when (types:mal-symbol-p func-symbol)
-                   (ignore-errors (env:get-env env func-symbol)))))
+                   (env:find-env env func-symbol))))
       (and func
            (types:mal-fn-p func)
            (cdr (assoc 'is-macro (types:mal-data-attrs func)))))))
diff --git a/clisp/step9_try.lisp b/clisp/step9_try.lisp
index 858b0bb6..9985c61e 100644
--- a/clisp/step9_try.lisp
+++ b/clisp/step9_try.lisp
@@ -89,7 +89,7 @@
              (not (zerop (length (mal-data-value ast)))))
     (let* ((func-symbol (first (mal-data-value ast)))
            (func (when (types:mal-symbol-p func-symbol)
-                   (ignore-errors (env:get-env env func-symbol)))))
+                   (env:find-env env func-symbol))))
       (and func
            (types:mal-fn-p func)
            (cdr (assoc 'is-macro (types:mal-data-attrs func)))))))
diff --git a/clisp/stepA_mal.lisp b/clisp/stepA_mal.lisp
index 73812b5a..93e6f6fb 100644
--- a/clisp/stepA_mal.lisp
+++ b/clisp/stepA_mal.lisp
@@ -89,7 +89,7 @@
              (not (zerop (length (mal-data-value ast)))))
     (let* ((func-symbol (first (mal-data-value ast)))
            (func (when (types:mal-symbol-p func-symbol)
-                   (ignore-errors (env:get-env env func-symbol)))))
+                   (env:find-env env func-symbol))))
       (and func
            (types:mal-fn-p func)
            (cdr (assoc 'is-macro (types:mal-data-attrs func)))))))