diff --git a/parfor/__init__.py b/parfor/__init__.py
index f917aa5..49b2d05 100644
--- a/parfor/__init__.py
+++ b/parfor/__init__.py
@@ -452,12 +452,15 @@ class PoolSingleton:
         self.__class__.instance = None
 
         def empty_queue(queue):
-            if not queue._closed:  # noqa
-                while not queue.empty():
-                    try:
-                        queue.get(True, 0.02)
-                    except multiprocessing.queues.Empty:  # noqa
-                        pass
+            try:
+                if not queue._closed:  # noqa
+                    while not queue.empty():
+                        try:
+                            queue.get(True, 0.02)
+                        except multiprocessing.queues.Empty:  # noqa
+                            pass
+            except OSError:
+                pass
 
         def close_queue(queue):
             empty_queue(queue)
@@ -469,14 +472,20 @@ class PoolSingleton:
             self.is_alive = False  # noqa
             self.event.set()
             self.pool.close()
+            t = time()
             while self.n_workers.value:  # noqa
                 empty_queue(self.queue_in)  # noqa
                 empty_queue(self.queue_out)  # noqa
+                if time() - t > 10:
+                    warn(f'Parfor: Closing pool timed out, {self.n_workers.value} processes still alive.')  # noqa
+                    self.pool.terminate()
+                    break
             empty_queue(self.queue_in)  # noqa
             empty_queue(self.queue_out)  # noqa
             self.pool.join()
             close_queue(self.queue_in)  # noqa
             close_queue(self.queue_out)  # noqa
+            self.manager.shutdown()
             self.handle = 0  # noqa
 
 
diff --git a/pyproject.toml b/pyproject.toml
index 3e73831..2b833b2 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "parfor"
-version = "2023.11.3"
+version = "2024.1.25"
 description = "A package to mimic the use of parfor as done in Matlab."
 authors = ["Wim Pomp <wimpomp@gmail.com>"]
 license = "GPLv3"