diff --git a/collects/handin-server/main.ss b/collects/handin-server/main.ss
index 9f83c38c1c..d3cbbbca97 100644
--- a/collects/handin-server/main.ss
+++ b/collects/handin-server/main.ss
@@ -693,11 +693,15 @@
               (close-output-port w)))))))
    #f ; `with-watcher' handles our timeouts
    (lambda (exn)
-     (printf "~a\n" (if (exn? exn) (exn-message exn) exn)))
+     (log-line "ERROR: ~a" (if (exn? exn) (exn-message exn) exn)))
    (lambda (port-k cnt reuse?)
      (let ([l (ssl-listen port-k cnt #t)])
        (ssl-load-certificate-chain! l "server-cert.pem")
        (ssl-load-private-key! l "private-key.pem")
        (start-notify)
        l))
-   ssl-close ssl-accept ssl-accept/enable-break))
+   (lambda (l)
+     (log-line "shutting down")
+     (stop-status)
+     (ssl-close l))
+   ssl-accept ssl-accept/enable-break))