1 files changed, 8 insertions, 1 deletions

diff --git a/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs b/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs
index 5874d9b..89a01f0 100644
--- a/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs
+++ b/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs
@@ -114,7 +114,14 @@ namespace OpenSim.Region.Environment.Modules.InterGrid
                         if (m_scene.Count == 0)
                         {
                             scene.AddLLSDHandler("/agent/", ProcessAgentDomainMessage);
-                            ServicePointManager.ServerCertificateValidationCallback += customXertificateValidation;
+                            try
+                            {
+                                ServicePointManager.ServerCertificateValidationCallback += customXertificateValidation;
+                            }
+                            catch (NotImplementedException)
+                            {
+                                m_log.Error("[OGP]: Certificate validation handler change not supported.  You may get ssl certificate validation errors teleporting from your region to some SSL regions.");
+                            }
                         }
 
                         if (!m_scene.Contains(scene))