Index: trunk/FACT++/src/queue.h
===================================================================
--- trunk/FACT++/src/queue.h	(revision 15610)
+++ trunk/FACT++/src/queue.h	(revision 15625)
@@ -90,5 +90,12 @@
     void join()
     {
-        fThread.join();
+        // This can happen is the thread is not running anymore
+        try
+        {
+            fThread.join();
+        }
+        catch (const std::system_error &)
+        {
+        }
     }
 };