diff --git a/gash/built-ins/trap.scm b/gash/built-ins/trap.scm
index e308b50..d9d2e2e 100644
--- a/gash/built-ins/trap.scm
+++ b/gash/built-ins/trap.scm
@@ -62,7 +62,9 @@
        (for-each (lambda (condition)
                    (match (condition->signum condition)
                      (0 (set-atexit! handler))
-                     (n (sigaction n handler))))
+                     (n (cond-expand
+                         (mes #f)
+                         (else (sigaction n handler))))))
                  conditions))
      EXIT_SUCCESS)
     (_ (format (current-error-port)
diff --git a/gash/shell.scm b/gash/shell.scm
index dc77884..4f08183 100644
--- a/gash/shell.scm
+++ b/gash/shell.scm
@@ -273,7 +273,9 @@ process."
     (0 (dynamic-wind
          (lambda () #t)
          (lambda ()
-           (restore-signals)
+           (cond-expand
+            (mes #f)
+            (else (restore-signals)))
            (set-atexit! #f)
            ;; We need to preserve the status given to 'exit', so we
            ;; catch the 'quit' key here.