2 files changed, 15 insertions, 5 deletions

diff --git a/OpenSim/Server/Base/ServerUtils.cs b/OpenSim/Server/Base/ServerUtils.cs
index 0964caa..9d9735e 100644
--- a/OpenSim/Server/Base/ServerUtils.cs
+++ b/OpenSim/Server/Base/ServerUtils.cs
@@ -260,7 +260,7 @@ namespace OpenSim.Server.Base
 
         public static Dictionary<string, object> ParseXmlResponse(string data)
         {
-            //m_log.DebugFormat("[XXX]: received xml string: {0}", data);
+            m_log.DebugFormat("[XXX]: received xml string: {0}", data);
 
             Dictionary<string, object> ret = new Dictionary<string, object>();
 
diff --git a/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs b/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs
index e22328d..08edcbf 100644
--- a/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs
+++ b/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs
@@ -137,11 +137,21 @@ namespace OpenSim.Server.Handlers.Grid
             }
 
             Dictionary<string, object> rinfoData = new Dictionary<string, object>();
-            foreach (KeyValuePair<string, string> kvp in request)
-                rinfoData[kvp.Key] = kvp.Value;
-            GridRegion rinfo = new GridRegion(rinfoData);
+            GridRegion rinfo = null;
+            try
+            {
+                foreach (KeyValuePair<string, string> kvp in request)
+                    rinfoData[kvp.Key] = kvp.Value;
+                rinfo = new GridRegion(rinfoData);
+            }
+            catch (Exception e)
+            {
+                m_log.DebugFormat("[GRID HANDLER]: exception unpacking region data: {0}", e);
+            }
 
-            bool result = m_GridService.RegisterRegion(scopeID, rinfo);
+            bool result = false;
+            if (rinfo != null)
+                result = m_GridService.RegisterRegion(scopeID, rinfo);
 
             if (result)
                 return SuccessResult();