2 files changed, 4 insertions, 1 deletions

diff --git a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
index a2e1e0c..a2c3c2c 100644
--- a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
@@ -107,7 +107,7 @@ namespace OpenSim.Region.Communications.Local
                 // connectivity errors.
                 // Don't change this line below to 'm_regions[regionInfo.RegionHandle] = regionInfo' unless you
                 // *REALLY* know what you are doing here.
-                m_regions.Remove(regionInfo.RegionHandle);
+                m_regions[regionInfo.RegionHandle] = regionInfo;
 
                 m_log.Warn("[INTERREGION STANDALONE]: Region registered twice. Region went down and came back up.");
 
diff --git a/OpenSim/Region/Communications/Local/LocalInventoryService.cs b/OpenSim/Region/Communications/Local/LocalInventoryService.cs
index 4f60462..6e7ace5 100644
--- a/OpenSim/Region/Communications/Local/LocalInventoryService.cs
+++ b/OpenSim/Region/Communications/Local/LocalInventoryService.cs
@@ -49,6 +49,9 @@ namespace OpenSim.Region.Communications.Local
             m_log.InfoFormat("[LOCAL INVENTORY SERVICE]: Requesting inventory for user {0}", userID);
 
             List<InventoryFolderBase> skeletonFolders = GetInventorySkeleton(userID);
+            if (skeletonFolders == null)
+                return;
+
             InventoryFolderImpl rootFolder = null;
 
             List<InventoryFolderImpl> folders = new List<InventoryFolderImpl>();