diff --git a/OpenSim/Framework/Servers/HttpServer/SimpleOSDMapHandler.cs b/OpenSim/Framework/Servers/HttpServer/SimpleOSDMapHandler.cs
index 48b53f22c1..8b3838f4ae 100644
--- a/OpenSim/Framework/Servers/HttpServer/SimpleOSDMapHandler.cs
+++ b/OpenSim/Framework/Servers/HttpServer/SimpleOSDMapHandler.cs
@@ -117,10 +117,18 @@ namespace OpenSim.Framework.Servers.HttpServer
                     return;
                 }
             }
-            if(m_processRequest != null)
-                m_processRequest(httpRequest, httpResponse, args);
-            else
-                ProcessRequest(httpRequest, httpResponse, args);
+            try
+            {
+                if(m_processRequest != null)
+                    m_processRequest(httpRequest, httpResponse, args);
+                else
+                    ProcessRequest(httpRequest, httpResponse, args);
+            }
+            catch
+            {
+                httpResponse.StatusCode = (int)HttpStatusCode.InternalServerError;
+            }
+
             RequestsHandled++;
         }
 
diff --git a/OpenSim/Framework/Servers/HttpServer/SimpleStreamHandler.cs b/OpenSim/Framework/Servers/HttpServer/SimpleStreamHandler.cs
index 3b411ff655..6badb7b424 100644
--- a/OpenSim/Framework/Servers/HttpServer/SimpleStreamHandler.cs
+++ b/OpenSim/Framework/Servers/HttpServer/SimpleStreamHandler.cs
@@ -88,10 +88,19 @@ namespace OpenSim.Framework.Servers.HttpServer
                     return;
                 }
             }
-            if(m_processRequest != null)
-                m_processRequest(httpRequest, httpResponse);
-            else
-                ProcessRequest(httpRequest, httpResponse);
+
+            try
+            {
+                if (m_processRequest != null)
+                    m_processRequest(httpRequest, httpResponse);
+                else
+                    ProcessRequest(httpRequest, httpResponse);
+            }
+            catch
+            {
+                httpResponse.StatusCode = (int)HttpStatusCode.InternalServerError;
+            }
+
             RequestsHandled++;
         }