diff --git a/scsh/network.scm b/scsh/network.scm
index e60a10f..78f48dd 100644
--- a/scsh/network.scm
+++ b/scsh/network.scm
@@ -86,24 +86,22 @@
     (set-socket-option sock level/socket socket/reuse-address #t)
     (bind-socket sock addr)
     (listen-socket sock 5)
-    (call-with-current-continuation
-     (lambda (exit)
+    (with-handler
+     (lambda (condition more)
        (with-handler
-	(lambda (condition more)
-	  (with-handler
-	   (lambda (condition ignore) (more))
-	   (lambda () (close-socket sock)))
-	  (exit 'interrupted))
-	(lambda ()
-	  (let loop ()
-	    (with-errno-handler
-	     ;; ECONNABORTED we just ignore
-	     ((errno packet)
-	      ((errno/connaborted) (loop)))
-	     (call-with-values 
-	      (lambda () (accept-connection sock))
-	      proc)
-	     (loop)))))))))
+	(lambda (condition ignore) (more))
+	(lambda () (close-socket sock)))
+       (more))
+     (lambda ()
+       (let loop ()
+	 (with-errno-handler
+	  ;; ECONNABORTED we just ignore
+	  ((errno packet)
+	   ((errno/connaborted) (loop)))
+	  (call-with-values 
+	   (lambda () (accept-connection sock))
+	   proc)
+	  (loop)))))))
 
 ;;;-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 ;;; Socket Record Structure