diff --git a/OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs b/OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs
index cc0ff7a7b1..e5b9cc0a8a 100644
--- a/OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs
+++ b/OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs
@@ -90,7 +90,6 @@ namespace OpenSim.DataStore.MonoSqlite
 
                 ds.Tables.Add(createTerrainTable());
                 setupTerrainCommands(terrainDa, conn);
-                terrainDa.Fill(ds.Tables["terrain"]);
                 
                 // WORKAROUND: This is a work around for sqlite on
                 // windows, which gets really unhappy with blob columns
@@ -99,10 +98,11 @@ namespace OpenSim.DataStore.MonoSqlite
                 try
                 {
                     shapeDa.Fill(ds.Tables["primshapes"]);
+                    terrainDa.Fill(ds.Tables["terrain"]);
                 }
                 catch (Exception)
                 {
-                    MainLog.Instance.Verbose("DATASTORE", "Caught fill error on primshapes table");
+                    MainLog.Instance.Verbose("DATASTORE", "Caught fill error on primshapes or terrain table");
                 }
                 return;
             }