diff --git a/src/pthread/thread.cpp b/src/pthread/thread.cpp
index 9e1a5146..cc71d97b 100644
--- a/src/pthread/thread.cpp
+++ b/src/pthread/thread.cpp
@@ -132,10 +132,12 @@ namespace boost
                 catch(thread_interrupted const&)
                 {
                 }
-                catch(...)
-                {
-                    std::terminate();
-                }
+// Removed as it stops the debugger identifying the cause of the exception
+// Unhandled exceptions still cause the application to terminate
+//                 catch(...)
+//                 {
+//                     std::terminate();
+//                 }
 
                 detail::tls_destructor(thread_info.get());
                 detail::set_current_thread_data(0);
diff --git a/src/win32/thread.cpp b/src/win32/thread.cpp
index 9c4f82b0..a72f0538 100644
--- a/src/win32/thread.cpp
+++ b/src/win32/thread.cpp
@@ -169,10 +169,12 @@ namespace boost
             catch(thread_interrupted const&)
             {
             }
-            catch(...)
-            {
-                std::terminate();
-            }
+// Removed as it stops the debugger identifying the cause of the exception
+// Unhandled exceptions still cause the application to terminate
+//             catch(...)
+//             {
+//                 std::terminate();
+//             }
             run_thread_exit_callbacks();
             return 0;
         }