2 files changed, 4 insertions, 2 deletions

diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs
index 515d620..4dee7a4 100644
--- a/OpenSim/Services/GridService/GridService.cs
+++ b/OpenSim/Services/GridService/GridService.cs
@@ -329,7 +329,7 @@ namespace OpenSim.Services.GridService
                 }
             }
 
-            if (m_AllowHypergridMapSearch && rdatas.Count == 0 && name.Contains("."))
+            if (m_AllowHypergridMapSearch && rdatas == null || (rdatas != null && rdatas.Count == 0) && name.Contains("."))
             {
                 GridRegion r = m_HypergridLinker.LinkRegion(scopeID, name);
                 if (r != null)
@@ -412,6 +412,7 @@ namespace OpenSim.Services.GridService
                     ret.Add(RegionData2RegionInfo(r));
             }
 
+            m_log.DebugFormat("[GRID SERVICE]: Fallback returned {0} regions", ret.Count);
             return ret;
         }
 
diff --git a/OpenSim/Services/GridService/HypergridLinker.cs b/OpenSim/Services/GridService/HypergridLinker.cs
index c0b635c..18d0586 100644
--- a/OpenSim/Services/GridService/HypergridLinker.cs
+++ b/OpenSim/Services/GridService/HypergridLinker.cs
@@ -470,7 +470,8 @@ namespace OpenSim.Services.GridService
                     string reason = string.Empty;
                     if (TryLinkRegionToCoords(UUID.Zero, mapName, xloc, yloc, out reason) == null)
                         MainConsole.Instance.Output("Failed to link region: " + reason);
-                    MainConsole.Instance.Output("Hyperlink established");
+                    else
+                        MainConsole.Instance.Output("Hyperlink established");
                 }
                 else
                 {