diff --git a/AssemblyVersion.cs b/AssemblyVersion.cs
index 32fdd3b..6b1df62 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.3.557")]
-[assembly: AssemblyFileVersion("3.0.3.557")]
\ No newline at end of file
+[assembly: AssemblyVersion("3.0.3.558")]
+[assembly: AssemblyFileVersion("3.0.3.558")]
\ No newline at end of file
diff --git a/WebApplication/Error.aspx.cs b/WebApplication/Error.aspx.cs
index c045dc5..932bf22 100644
--- a/WebApplication/Error.aspx.cs
+++ b/WebApplication/Error.aspx.cs
@@ -9,6 +9,8 @@ using System.Web.UI;
 using System.Web.UI.WebControls;
 using System.Web.UI.WebControls.WebParts;
 using System.Web.UI.HtmlControls;
+using System.Security.Cryptography;
+using System.Threading;
 
 namespace ScrewTurn.Wiki {
 
@@ -27,6 +29,18 @@ namespace ScrewTurn.Wiki {
 				pnlException.Visible = false;
 			}
 			Session["LastError"] = null;
+
+			// Workaround for ASP.NET vulnerability
+			// http://weblogs.asp.net/scottgu/archive/2010/09/18/important-asp-net-security-vulnerability.aspx
+			byte[] delay = new byte[1];
+			RandomNumberGenerator prng = new RNGCryptoServiceProvider();
+
+			prng.GetBytes(delay);
+			Thread.Sleep((int)delay[0]);
+
+			IDisposable disposable = prng as IDisposable;
+			if(disposable != null) { disposable.Dispose(); }
+
 		}
 
 	}
diff --git a/WebApplication/Web.Release.config b/WebApplication/Web.Release.config
index f6352ea..919071f 100644
--- a/WebApplication/Web.Release.config
+++ b/WebApplication/Web.Release.config
@@ -49,6 +49,7 @@
 			 or when rebuilding the search engine index or page links.
 			 1 hour = 3600 seconds. -->
 		<httpRuntime executionTimeout="3600" maxRequestLength="20480"/>
+		<customErrors mode="On" defaultRedirect="~/Error.aspx" />
 		<pages enableViewState="true">
 			<controls>
 				<add assembly="Anthem" namespace="Anthem" tagPrefix="anthem"/>
diff --git a/WebApplication/Web.SqlServer.Release.config b/WebApplication/Web.SqlServer.Release.config
index 520c9a7..7c3808b 100644
--- a/WebApplication/Web.SqlServer.Release.config
+++ b/WebApplication/Web.SqlServer.Release.config
@@ -49,6 +49,7 @@
 			 or when rebuilding the search engine index or page links.
 			 1 hour = 3600 seconds. -->
 		<httpRuntime executionTimeout="3600" maxRequestLength="20480"/>
+		<customErrors mode="On" defaultRedirect="~/Error.aspx" />
 		<pages enableViewState="true">
 			<controls>
 				<add assembly="Anthem" namespace="Anthem" tagPrefix="anthem"/>
diff --git a/WebApplication/Web.config b/WebApplication/Web.config
index be770a6..a02ae12 100644
--- a/WebApplication/Web.config
+++ b/WebApplication/Web.config
@@ -49,6 +49,7 @@
 			 or when rebuilding the search engine index or page links.
 			 1 hour = 3600 seconds. -->
 		<httpRuntime executionTimeout="3600" maxRequestLength="20480"/>
+		<customErrors mode="On" defaultRedirect="~/Error.aspx" />
 		<pages enableViewState="true">
 			<controls>
 				<add assembly="Anthem" namespace="Anthem" tagPrefix="anthem"/>