diff --git a/src/h/impl/math_fenv.h b/src/h/impl/math_fenv.h
index 3a416ac31..3c072852a 100644
--- a/src/h/impl/math_fenv.h
+++ b/src/h/impl/math_fenv.h
@@ -54,7 +54,7 @@
 
 #ifdef HAVE_FENV_H
 # define ECL_WITHOUT_FPE_BEGIN do { fenv_t env; feholdexcept(&env);
-# define ECL_WITHOUT_FPE_END } while (0)
+# define ECL_WITHOUT_FPE_END        fesetenv(&env); } while (0)
 #else
 # define FE_INVALID 1
 # define FE_DIVBYZERO 2
diff --git a/src/lsp/top.lsp b/src/lsp/top.lsp
index 101bba59e..70b1b2a19 100644
--- a/src/lsp/top.lsp
+++ b/src/lsp/top.lsp
@@ -398,7 +398,6 @@ The top-level loop of ECL. It is called by default when ECL is invoked."
       (in-package "CL-USER")
 
       (unless (or *lisp-initialized* (null process-command-line))
-        (si:trap-fpe :last t)
         (process-command-args)
         (format t "ECL (Embeddable Common-Lisp) ~A (git:~D)"
                 (lisp-implementation-version)