1 files changed, 20 insertions, 3 deletions

diff --git a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
index d9c34e4..2089f07 100644
--- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
@@ -278,9 +278,26 @@ namespace OpenSim.Region.Environment.Scenes
                     agent.child = true;
 
                     InformClientOfNeighbourDelegate d = InformClientOfNeighbourAsync;
-                    d.BeginInvoke(avatar, agent, neighbours[i].RegionHandle, neighbours[i].ExternalEndPoint,
-                                  InformClientOfNeighbourCompleted,
-                                  d);
+                    
+                    try
+                    {
+                        d.BeginInvoke(avatar, agent, neighbours[i].RegionHandle, neighbours[i].ExternalEndPoint,
+                                      InformClientOfNeighbourCompleted,
+                                      d);
+                    }
+                    catch (Exception e)
+                    {
+                        m_log.ErrorFormat(
+                            "[REGIONINFO]: Could not resolve external hostname {0} for region {1} ({2}, {3})", 
+                            neighbours[i].ExternalHostName, 
+                            neighbours[i].RegionHandle, 
+                            neighbours[i].RegionLocX, 
+                            neighbours[i].RegionLocY);
+                                                
+                        // FIXME: Okay, even though we've failed, we're still going to throw the exception on,
+                        // since I don't know what will happen if we just let the client continue
+                        throw e;                        
+                    }                    
                 }
             }
         }