1 files changed, 5 insertions, 2 deletions

diff --git a/OpenSim/Framework/Monitoring/JobEngine.cs b/OpenSim/Framework/Monitoring/JobEngine.cs
index 0a39e4b..a6a059d 100644
--- a/OpenSim/Framework/Monitoring/JobEngine.cs
+++ b/OpenSim/Framework/Monitoring/JobEngine.cs
@@ -136,12 +136,15 @@ namespace OpenSim.Framework.Monitoring
                     if(m_jobQueue.Count <= 0)
                         m_cancelSource.Cancel();
 
-                    if(m_finishedProcessingAfterStop.WaitOne(RequestProcessTimeoutOnStop))
+                    m_finishedProcessingAfterStop.WaitOne(RequestProcessTimeoutOnStop);
                         m_finishedProcessingAfterStop.Close();
                 }
                 finally
                 {
-                    m_cancelSource.Dispose();
+                    if(m_cancelSource != null)
+                        m_cancelSource.Dispose();
+                    if(m_finishedProcessingAfterStop != null)
+                        m_finishedProcessingAfterStop.Dispose();
                 }
             }
         }