diff --git a/text/pyopenjtalk_worker/__init__.py b/text/pyopenjtalk_worker/__init__.py
index 8a10266..e968aed 100644
--- a/text/pyopenjtalk_worker/__init__.py
+++ b/text/pyopenjtalk_worker/__init__.py
@@ -54,6 +54,7 @@ def initialize(port: int = WOKER_PORT):
     import socket
     import sys
     import atexit
+    import signal
 
     logger.debug("initialize")
     global WORKER_CLIENT
@@ -100,6 +101,15 @@ def initialize(port: int = WOKER_PORT):
     WORKER_CLIENT = client
     atexit.register(terminate)
 
+    # when the process is killed
+    def signal_handler(signum, frame):
+        with open("signal_handler.txt", mode="w") as f:
+
+            pass
+        terminate()
+
+    signal.signal(signal.SIGTERM, signal_handler)
+
 
 # top-level declaration
 def terminate():
diff --git a/text/pyopenjtalk_worker/worker_server.py b/text/pyopenjtalk_worker/worker_server.py
index 13bc771..dc6d476 100644
--- a/text/pyopenjtalk_worker/worker_server.py
+++ b/text/pyopenjtalk_worker/worker_server.py
@@ -86,6 +86,12 @@ class WorkerServer:
                             self.client_count -= 1
                             logger.info("close connection")
                             continue
+                        except Exception as e:
+                            sock.close()
+                            sockets.remove(sock)
+                            self.client_count -= 1
+                            logger.error(e)
+                            continue
 
                         logger.trace(f"server received request: {request}")