3 files changed, 14 insertions, 6 deletions

diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs
index 75eb889..773286c 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs
@@ -40,7 +40,6 @@ using OpenSim.Services.Interfaces;
 using GridRegion = OpenSim.Services.Interfaces.GridRegion;
 using PresenceInfo = OpenSim.Services.Interfaces.PresenceInfo;
 using OpenSim.Server.Base;
-using OpenSim.Services.Connectors.Grid;
 using OpenSim.Framework.Console;
 
 using OpenMetaverse;
diff --git a/OpenSim/Services/HypergridService/GatekeeperService.cs b/OpenSim/Services/HypergridService/GatekeeperService.cs
index 174174c..6305f37 100644
--- a/OpenSim/Services/HypergridService/GatekeeperService.cs
+++ b/OpenSim/Services/HypergridService/GatekeeperService.cs
@@ -77,15 +77,24 @@ namespace OpenSim.Services.HypergridService
 
         public bool LinkRegion(string regionName, out UUID regionID, out ulong regionHandle, out string imageURL, out string reason)
         {
-            regionID = m_DefaultGatewayRegion.RegionID;
-            regionHandle = m_DefaultGatewayRegion.RegionHandle;
+            regionID = UUID.Zero;
+            regionHandle = 0;
             imageURL = string.Empty;
             reason = string.Empty;
 
+            m_log.DebugFormat("[GATEKEEPER SERVICE]: Request to link to {0}", regionName);
             if (!m_AllowTeleportsToAnyRegion)
             {
-                regionID = m_DefaultGatewayRegion.RegionID;
-                regionHandle = m_DefaultGatewayRegion.RegionHandle;
+                try
+                {
+                    regionID = m_DefaultGatewayRegion.RegionID;
+                    regionHandle = m_DefaultGatewayRegion.RegionHandle;
+                }
+                catch
+                {
+                    reason = "Grid setup problem";
+                    return false;
+                }
                 if (regionName != string.Empty)
                 {
                     reason = "Direct links to regions not allowed";
diff --git a/OpenSim/Services/HypergridService/HGCommands.cs b/OpenSim/Services/HypergridService/HGCommands.cs
index 10d04ff..f48fd70 100644
--- a/OpenSim/Services/HypergridService/HGCommands.cs
+++ b/OpenSim/Services/HypergridService/HGCommands.cs
@@ -69,7 +69,7 @@ namespace OpenSim.Services.HypergridService
 
             MainConsole.Instance.Output("Region Name          Region UUID");
             MainConsole.Instance.Output("Location             URI");
-            MainConsole.Instance.Output("Owner ID                                Flags");
+            MainConsole.Instance.Output("Owner ID  ");
             MainConsole.Instance.Output("-------------------------------------------------------------------------------");
             foreach (GridRegion r in regions)
             {