2 files changed, 18 insertions, 2 deletions

diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs
index b3687de..16a05af 100644
--- a/OpenSim/Data/SQLite/SQLiteRegionData.cs
+++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs
@@ -719,7 +719,23 @@ namespace OpenSim.Data.SQLite
                 terrainDa.Update(ds, "terrain");
                 landDa.Update(ds, "land");
                 landAccessListDa.Update(ds, "landaccesslist");
-                regionSettingsDa.Update(ds, "regionsettings");
+                try
+                {
+                    regionSettingsDa.Update(ds, "regionsettings");
+                } 
+                catch (SqliteExecutionException SqlEx)
+                {
+                  if (SqlEx.Message.Contains("logic error"))
+                  {
+                      throw new Exception(
+                          "There was a SQL error or connection string configuration error when saving the region settings.  This could be a bug, it could also happen if ConnectionString is defined in the [DatabaseService] section of StandaloneCommon.ini in the config_include folder.  This could also happen if the config_include folder doesn't exist or if the OpenSim.ini [Architecture] section isn't set.  If this is your first time running OpenSimulator, please restart the simulator and bug a developer to fix this!",
+                          SqlEx);
+                  }
+                  else
+                  {
+                      throw SqlEx;
+                  }
+                }
                 ds.AcceptChanges();
             }
         }
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index c9fd6b5..92cea43 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -158,7 +158,7 @@ namespace OpenSim.Region.Framework.Scenes
 
                     if (m_InventoryService == null)
                     {
-                        throw new Exception("No IInventoryService available.");
+                        throw new Exception("No IInventoryService available. This could happen if the config_include folder doesn't exist or if the OpenSim.ini [Architecture] section isn't set.  Please also check that you have the correct version of your inventory service dll.  Sometimes old versions of this dll will still exist.  Do a clean checkout and re-create the opensim.ini from the opensim.ini.example.");
                     }
                 }