diff --git a/OpenSim/Data/MySQL/MySQLDataStore.cs b/OpenSim/Data/MySQL/MySQLDataStore.cs
index 7482df31c0..8f3d90446d 100644
--- a/OpenSim/Data/MySQL/MySQLDataStore.cs
+++ b/OpenSim/Data/MySQL/MySQLDataStore.cs
@@ -735,6 +735,7 @@ namespace OpenSim.Data.MySQL
                 {
                     RegionSettings rs = new RegionSettings();
                     rs.RegionUUID = regionUUID;
+                    rs.OnSave += StoreRegionSettings;
 
                     StoreRegionSettings(rs);
 
diff --git a/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs
index c0fdc05f92..7ca1f3ae3e 100644
--- a/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs
@@ -120,6 +120,9 @@ namespace OpenSim.Region.Environment.Modules.World.Estate
 
         public void setEstateTerrainBaseTexture(IClientAPI remoteClient, int corner, LLUUID texture)
         {
+            if(texture == LLUUID.Zero)
+                return;
+
             switch (corner)
             {
                 case 0: