diff --git a/OpenSim/Region/Environment/StorageManager.cs b/OpenSim/Region/Environment/StorageManager.cs
index 9f2730fe39..8f8ac97206 100644
--- a/OpenSim/Region/Environment/StorageManager.cs
+++ b/OpenSim/Region/Environment/StorageManager.cs
@@ -38,20 +38,17 @@ namespace OpenSim.Region.Environment
             {
                 if (pluginType.IsPublic)
                 {
-                    if (!pluginType.IsAbstract)
+                    Type typeInterface = pluginType.GetInterface("IRegionDataStore", true);
+
+                    if (typeInterface != null)
                     {
-                        Type typeInterface = pluginType.GetInterface("IRegionDataStore", true);
+                        IRegionDataStore plug = (IRegionDataStore)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
+                        plug.Initialise(dataStoreFile, dataStoreDB);
 
-                        if (typeInterface != null)
-                        {
-                            IRegionDataStore plug = (IRegionDataStore)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
-                            plug.Initialise(dataStoreFile, dataStoreDB);
-
-                            m_dataStore = plug;
-                        }
-
-                        typeInterface = null;
+                        m_dataStore = plug;
                     }
+
+                    typeInterface = null;
                 }
             }
 
diff --git a/OpenSim/Region/Storage/OpenSim.DataStore.NullStorage/NullDataStore.cs b/OpenSim/Region/Storage/OpenSim.DataStore.NullStorage/NullDataStore.cs
index 8542ef3b81..7c8bd07031 100644
--- a/OpenSim/Region/Storage/OpenSim.DataStore.NullStorage/NullDataStore.cs
+++ b/OpenSim/Region/Storage/OpenSim.DataStore.NullStorage/NullDataStore.cs
@@ -10,7 +10,7 @@ using libsecondlife;
 
 namespace OpenSim.DataStore.NullStorage
 {
-    class NullDataStore : IRegionDataStore
+    public class NullDataStore : IRegionDataStore
     {
         public void Initialise(string dbfile, string dbname)
         {