diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index 473a01c1bd..988d859598 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -155,7 +155,8 @@ namespace OpenSim.Framework.Servers.HttpServer
 
         public List<string>  GetStreamHandlerKeys()
         {
-            return new List<string>(m_streamHandlers.Keys);
+            lock (m_streamHandlers)
+                return new List<string>(m_streamHandlers.Keys);
         }
 
         private static string GetHandlerKey(string httpMethod, string path)
@@ -1793,7 +1794,8 @@ namespace OpenSim.Framework.Servers.HttpServer
 
             //m_log.DebugFormat("[BASE HTTP SERVER]: Removing handler key {0}", handlerKey);
 
-            lock (m_streamHandlers) m_streamHandlers.Remove(handlerKey);
+            lock (m_streamHandlers)
+                m_streamHandlers.Remove(handlerKey);
         }
 
         public void RemoveHTTPHandler(string httpMethod, string path)