diff --git a/OpenSim/Services/GridService/HypergridLinker.cs b/OpenSim/Services/GridService/HypergridLinker.cs
index cda7dae710..c0b635cc4a 100644
--- a/OpenSim/Services/GridService/HypergridLinker.cs
+++ b/OpenSim/Services/GridService/HypergridLinker.cs
@@ -165,13 +165,17 @@ namespace OpenSim.Services.GridService
                 regionName = parts[2];
             }
 
-            // Sanity check. Don't ever link to this sim.
+            // Sanity check. 
             IPAddress ipaddr = null;
             try
             {
                 ipaddr = Util.GetHostFromDNS(host);
             }
-            catch { }
+            catch 
+            {
+                reason = "Malformed hostname";
+                return null;
+            }
 
             GridRegion regInfo;
             bool success = TryCreateLink(scopeID, xloc, yloc, regionName, port, host, out regInfo, out reason);
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs
index cacedf8c9a..1c5245d43e 100644
--- a/OpenSim/Services/LLLoginService/LLLoginService.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginService.cs
@@ -405,6 +405,7 @@ namespace OpenSim.Services.LLLoginService
             gatekeeper.ExternalHostName = domainName;
             gatekeeper.HttpPort = port;
             gatekeeper.RegionName = regionName;
+            gatekeeper.InternalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), 0);
 
             UUID regionID;
             ulong handle;