2 files changed, 5 insertions, 2 deletions

diff --git a/OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs b/OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs
index 4e60ca9..ceb7905 100644
--- a/OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs
+++ b/OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs
@@ -88,8 +88,7 @@ namespace OpenSim.Tests.Common
             if (type == InventoryType.Notecard)
                 asset = AssetHelpers.CreateAsset(scene, userId);
             else if (type == InventoryType.Object)
-                asset
-                    = AssetHelpers.CreateAsset(assetId, SceneHelpers.CreateSceneObject(1, userId));
+                asset = AssetHelpers.CreateAsset(assetId, SceneHelpers.CreateSceneObject(1, userId));
             else
                 throw new Exception(string.Format("Inventory type {0} not supported", type));
 
diff --git a/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs b/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs
index 2ea36da..79bb9c2 100644
--- a/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs
+++ b/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs
@@ -163,6 +163,10 @@ namespace OpenSim.Data.Null
         {
             RegionSettings rs = null;
             m_regionSettings.TryGetValue(regionUUID, out rs);
+
+            if (rs == null)
+                rs = new RegionSettings();
+            
             return rs;
         }