diff --git a/OpenSim/Framework/BlockingQueue.cs b/OpenSim/Framework/BlockingQueue.cs
index daf99a8fbd..f6861e49d2 100644
--- a/OpenSim/Framework/BlockingQueue.cs
+++ b/OpenSim/Framework/BlockingQueue.cs
@@ -78,7 +78,8 @@ namespace OpenSim.Framework
             {
                 if (m_queue.Count < 1 && m_pqueue.Count < 1)
                 {
-                    Monitor.Wait(m_queueSync, msTimeout);
+                    if(!Monitor.Wait(m_queueSync, msTimeout))
+                        return default(T);
                 }
 
                 if (m_pqueue.Count > 0)