diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index dfc79b78c7..4bb1f8467a 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -2451,16 +2451,17 @@ namespace OpenSim.Region.Environment.Scenes
                     //Console.WriteLine("BEFORE CROSS");
                     //Scene.DumpChildrenSeeds(UUID);
                     //DumpKnownRegions();
-
-                    if (!m_knownChildRegions.ContainsKey(neighbourRegion.RegionHandle))
+                    string agentcaps;
+                    if (!m_knownChildRegions.TryGetValue(neighbourRegion.RegionHandle, out agentcaps))
                     {
                         m_log.ErrorFormat("[SCENE PRESENCE]: No CAPS information for region handle {0}, exiting CrossToNewRegion.",
                                          neighbourRegion.RegionHandle);
+                        return;
                     }
                     // TODO Should construct this behind a method
                     string capsPath =
                         "http://" + neighbourRegion.ExternalHostName + ":" + neighbourRegion.HttpPort
-                         + "/CAPS/" + m_knownChildRegions[neighbourRegion.RegionHandle] /*circuitdata.CapsPath*/ + "0000/";
+                         + "/CAPS/" + agentcaps /*circuitdata.CapsPath*/ + "0000/";
 
                     m_log.DebugFormat("[CAPS]: Sending new CAPS seed url {0} to client {1}", capsPath, m_uuid);