diff --git a/scsh/top.scm b/scsh/top.scm
index 8da44a4..5fee133 100644
--- a/scsh/top.scm
+++ b/scsh/top.scm
@@ -343,14 +343,14 @@
       (parse-scsh-args (cdr all-args))
     (with-handler 
      (lambda (cond more)
-       (if (warning? cond)
-	   (more)
-	   (with-handler
-	    (lambda (c m)
-	      (scheme-exit-now 1))
-	    (lambda ()
+       (if (error? cond)
+           (with-handler
+            (lambda (c m)
+              (scheme-exit-now 1))
+            (lambda ()
               (display-condition cond (current-error-port))
-              (scsh-exit-now 1)))))
+              (scsh-exit-now 1)))
+             (more)))
      (lambda ()
        (with-scsh-initialized
 	(not term-switch) context args