diff --git a/extra/io/server/server-tests.factor b/extra/io/server/server-tests.factor
new file mode 100644
index 0000000000..5c37a37380
--- /dev/null
+++ b/extra/io/server/server-tests.factor
@@ -0,0 +1,4 @@
+IN: temporary
+USING: tools.test.inference io.server ;
+
+{ 1 0 } [ [ ] spawn-server ] unit-test-effect
diff --git a/extra/io/server/server.factor b/extra/io/server/server.factor
index 6389c2c024..0141289c38 100755
--- a/extra/io/server/server.factor
+++ b/extra/io/server/server.factor
@@ -48,7 +48,7 @@ SYMBOL: log-stream
     dup log-client
     [ swap with-stream ] 2curry concurrency:spawn drop ; inline
 
-: accept-loop ( server quot -- )
+: accept-loop ( server quot -- server quot )
     [ swap accept with-client ] 2keep accept-loop ; inline
 
 : server-loop ( server quot -- )
@@ -62,6 +62,7 @@ SYMBOL: log-stream
     ] [
         "Cannot spawn server: " print
         print-error
+        2drop
     ] recover ; inline
 
 : local-server ( port -- seq )