diff --git a/server/server.js b/server/server.js
index cdf07c0..d4bc9a3 100644
--- a/server/server.js
+++ b/server/server.js
@@ -53,11 +53,14 @@ async function startServer() {
  */
 function stopServer() {
   if (serverInstance) {
-    serverInstance.close();
-    logger.info("Express server closed cleanly.");
-
+    try{
+      serverInstance.close();
+      logger.info("Express server closed cleanly");
+    } catch (err){
+      logger.error("Express server was not closed cleanly:", err)
+    }
   } else {
-    logger.error("Express server was not closed cleanly")
+    logger.info("Express server was already closed");
   }
 }