diff --git a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
index d1fe3c7c2f..fb63c6a95f 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
@@ -216,7 +216,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                     // while we don't fix the hard-coded urls
                     if (flags == 2) 
                     {
-                        if (regionInfos.Count == 0)
+                        if (regionInfos == null || regionInfos.Count == 0)
                             remoteClient.SendAgentAlertMessage("No regions found with that name.", true);
     //                    else if (regionInfos.Count == 1)
     //                        remoteClient.SendAgentAlertMessage("Region found!", false);