From 2770f65027b145202a32becfda96556350a34b66 Mon Sep 17 00:00:00 2001
From: binwiederhier <phil@heckel.io>
Date: Wed, 25 Mar 2026 21:12:27 -0400
Subject: [PATCH] Arrrg

---
 server/server.go      | 8 ++++++--
 server/server_test.go | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/server/server.go b/server/server.go
index 71d08b01..ff631359 100644
--- a/server/server.go
+++ b/server/server.go
@@ -433,14 +433,18 @@ func (s *Server) Stop() {
 		s.attachment.Close()
 	}
 	s.closeDatabases()
-	close(s.closeChan)
+	if s.closeChan != nil {
+		close(s.closeChan)
+	}
 }
 
 func (s *Server) closeDatabases() {
 	if s.userManager != nil {
 		s.userManager.Close()
 	}
-	s.messageCache.Close()
+	if s.messageCache != nil {
+		s.messageCache.Close()
+	}
 	if s.webPush != nil {
 		s.webPush.Close()
 	}
diff --git a/server/server_test.go b/server/server_test.go
index 78a04b8f..fa4bf915 100644
--- a/server/server_test.go
+++ b/server/server_test.go
@@ -4195,7 +4195,7 @@ func newTestConfigWithAuthFile(t *testing.T, databaseURL string) *Config {
 func newTestServer(t *testing.T, config *Config) *Server {
 	server, err := New(config)
 	require.Nil(t, err)
-	t.Cleanup(server.closeDatabases)
+	t.Cleanup(server.Stop)
 	return server
 }