1 files changed, 10 insertions, 1 deletions

diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index c4c2ffd..a4fa3bb 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -1547,7 +1547,16 @@ namespace OpenSim.Region.Communications.OGS1
 
             IPAddress ia;
             IPAddress.TryParse(address, out ia);
-            IPEndPoint m_EndPoint = new IPEndPoint(ia, (int)port);
+            IPEndPoint m_EndPoint;
+            try
+            {
+                m_EndPoint = new IPEndPoint(ia, (int)port);
+            }
+            catch (Exception)
+            {
+                m_log.Debug("[OGS1 GRID SERVICES]: Invalid remoting address: " + address);
+                return false;
+            }
 
             AsyncCallback callback = delegate(IAsyncResult iar)
             {