diff --git a/OpenSim/Region/Environment/Modules/Agent/Capabilities/CapabilitiesModule.cs b/OpenSim/Region/Environment/Modules/Agent/Capabilities/CapabilitiesModule.cs
index 9fa6d7d144..838851ca92 100644
--- a/OpenSim/Region/Environment/Modules/Agent/Capabilities/CapabilitiesModule.cs
+++ b/OpenSim/Region/Environment/Modules/Agent/Capabilities/CapabilitiesModule.cs
@@ -175,9 +175,11 @@ namespace OpenSim.Region.Environment.Modules.Agent.Capabilities
         public string GetChildSeed(UUID agentID, ulong handle)
         {
             Dictionary<ulong, string> seeds;
+            string returnval;
             if (childrenSeeds.TryGetValue(agentID, out seeds))
             {
-                return seeds[handle];
+                if (seeds.TryGetValue(handle, out returnval))
+                    return returnval;
             }
             return null;
         }
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 02d3642b75..dfc79b78c7 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -2452,6 +2452,11 @@ namespace OpenSim.Region.Environment.Scenes
                     //Scene.DumpChildrenSeeds(UUID);
                     //DumpKnownRegions();
 
+                    if (!m_knownChildRegions.ContainsKey(neighbourRegion.RegionHandle))
+                    {
+                        m_log.ErrorFormat("[SCENE PRESENCE]: No CAPS information for region handle {0}, exiting CrossToNewRegion.",
+                                         neighbourRegion.RegionHandle);
+                    }
                     // TODO Should construct this behind a method
                     string capsPath =
                         "http://" + neighbourRegion.ExternalHostName + ":" + neighbourRegion.HttpPort