1 files changed, 13 insertions, 4 deletions

diff --git a/OpenSim/Framework/ThreadTracker.cs b/OpenSim/Framework/ThreadTracker.cs
index 984acfa..0a63239 100644
--- a/OpenSim/Framework/ThreadTracker.cs
+++ b/OpenSim/Framework/ThreadTracker.cs
@@ -52,12 +52,21 @@ namespace OpenSim.Framework
         }
 
         private static void ThreadTrackerThreadLoop()
-        {
-            while (true)
+        {            
+            try
             {
-                Thread.Sleep(5000);
-                CleanUp();
+                while (true)
+                {
+                    Thread.Sleep(5000);
+                    CleanUp();
+                }
             }
+            catch (Exception e)
+            {
+                m_log.ErrorFormat(
+                    "[THREAD TRACKER]: Thread tracker cleanup thread terminating with exception.  Please report this error.  Exception is {0}", 
+                    e);                
+            }                
         }
 
         public static void Add(Thread thread)