diff --git a/AssemblyVersion.cs b/AssemblyVersion.cs
index 7886805..14e2b02 100644
--- a/AssemblyVersion.cs
+++ b/AssemblyVersion.cs
@@ -16,5 +16,5 @@ using System.Reflection;
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("3.0.4.565")]
-[assembly: AssemblyFileVersion("3.0.4.565")]
\ No newline at end of file
+[assembly: AssemblyVersion("3.0.4.566")]
+[assembly: AssemblyFileVersion("3.0.4.566")]
\ No newline at end of file
diff --git a/Core/PagesStorageProvider.cs b/Core/PagesStorageProvider.cs
index 15525f8..1784789 100644
--- a/Core/PagesStorageProvider.cs
+++ b/Core/PagesStorageProvider.cs
@@ -1189,6 +1189,8 @@ namespace ScrewTurn.Wiki {
 		private int IndexPage(PageContent content) {
 			lock(this) {
 				try {
+					if(string.IsNullOrEmpty(content.Title) || string.IsNullOrEmpty(content.Content)) return 0;
+
 					string documentName = PageDocument.GetDocumentName(content.PageInfo);
 
 					DumpedDocument ddoc = new DumpedDocument(0, documentName, host.PrepareTitleForIndexing(content.PageInfo, content.Title),
@@ -2396,6 +2398,8 @@ namespace ScrewTurn.Wiki {
 		private int IndexMessage(PageInfo page, int id, string subject, DateTime dateTime, string body) {
 			lock(this) {
 				try {
+					if(string.IsNullOrEmpty(subject) || string.IsNullOrEmpty(body)) return 0;
+
 					// Trim "RE:" to avoid polluting the search engine index
 					if(subject.ToLowerInvariant().StartsWith("re:") && subject.Length > 3) subject = subject.Substring(3).Trim();
 
diff --git a/SqlProvidersCommon/SqlPagesStorageProviderBase.cs b/SqlProvidersCommon/SqlPagesStorageProviderBase.cs
index 0f4b0b8..2e891e2 100644
--- a/SqlProvidersCommon/SqlPagesStorageProviderBase.cs
+++ b/SqlProvidersCommon/SqlPagesStorageProviderBase.cs
@@ -593,6 +593,8 @@ namespace ScrewTurn.Wiki.Plugins.SqlCommon {
 		/// <returns>The number of indexed words, including duplicates.</returns>
 		private int IndexPage(PageContent content, DbTransaction transaction) {
 			try {
+				if(string.IsNullOrEmpty(content.Title) || string.IsNullOrEmpty(content.Content)) return 0;
+
 				string documentName = PageDocument.GetDocumentName(content.PageInfo);
 
 				DumpedDocument ddoc = new DumpedDocument(0, documentName, host.PrepareTitleForIndexing(content.PageInfo, content.Title),
@@ -654,6 +656,8 @@ namespace ScrewTurn.Wiki.Plugins.SqlCommon {
 		/// <returns>The number of indexed words, including duplicates.</returns>
 		private int IndexMessage(PageInfo page, int id, string subject, DateTime dateTime, string body, DbTransaction transaction) {
 			try {
+				if(string.IsNullOrEmpty(subject) || string.IsNullOrEmpty(body)) return 0;
+
 				// Trim "RE:" to avoid polluting the search engine index
 				if(subject.ToLowerInvariant().StartsWith("re:") && subject.Length > 3) subject = subject.Substring(3).Trim();
 
diff --git a/SqlServerProviders/SqlServerPagesStorageProvider.cs b/SqlServerProviders/SqlServerPagesStorageProvider.cs
index 58c7603..cf2e258 100644
--- a/SqlServerProviders/SqlServerPagesStorageProvider.cs
+++ b/SqlServerProviders/SqlServerPagesStorageProvider.cs
@@ -13,7 +13,7 @@ namespace ScrewTurn.Wiki.Plugins.SqlServer {
 	/// </summary>
 	public class SqlServerPagesStorageProvider : SqlPagesStorageProviderBase, IPagesStorageProviderV30 {
 
-		private readonly ComponentInformation info = new ComponentInformation("SQL Server Pages Storage Provider", "Threeplicate Srl", "3.0.2.541", "http://www.screwturn.eu", "http://www.screwturn.eu/Version/SQLServerProv/Pages.txt");
+		private readonly ComponentInformation info = new ComponentInformation("SQL Server Pages Storage Provider", "Threeplicate Srl", "3.0.4.566", "http://www.screwturn.eu", "http://www.screwturn.eu/Version/SQLServerProv/Pages.txt");
 
 		private readonly SqlServerCommandBuilder commandBuilder = new SqlServerCommandBuilder();