diff --git a/source/java/org/alfresco/web/bean/dialog/BaseDialogBean.java b/source/java/org/alfresco/web/bean/dialog/BaseDialogBean.java
index d336da58f1..eeef78b4c9 100644
--- a/source/java/org/alfresco/web/bean/dialog/BaseDialogBean.java
+++ b/source/java/org/alfresco/web/bean/dialog/BaseDialogBean.java
@@ -141,6 +141,7 @@ public abstract class BaseDialogBean implements IDialogBean, Serializable
             
             Utils.addErrorMessage(formatErrorMessage(e), e);
             outcome = getErrorOutcome(e);
+            ReportedException.throwIfNecessary(e);
          }
       }
       
diff --git a/source/web/WEB-INF/alfresco.tld b/source/web/WEB-INF/alfresco.tld
index 562d4680be..6d1e313dc8 100644
--- a/source/web/WEB-INF/alfresco.tld
+++ b/source/web/WEB-INF/alfresco.tld
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_2.dtd">
+<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN" "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd">
 
 <!-- Alfresco common JSF UI components tag library -->
 <taglib>
diff --git a/source/web/WEB-INF/repo.tld b/source/web/WEB-INF/repo.tld
index 23a4da97ef..94269d2fbd 100644
--- a/source/web/WEB-INF/repo.tld
+++ b/source/web/WEB-INF/repo.tld
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_2.dtd">
+<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN" "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd">
 
 <taglib>
 
diff --git a/source/web/WEB-INF/wcm.tld b/source/web/WEB-INF/wcm.tld
index dd84d654e9..2be766371c 100644
--- a/source/web/WEB-INF/wcm.tld
+++ b/source/web/WEB-INF/wcm.tld
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_2.dtd">
+<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN" "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd">
 
 <taglib>
 
diff --git a/source/web/WEB-INF/web-application-context.xml b/source/web/WEB-INF/web-application-context.xml
new file mode 100644
index 0000000000..55e56a09c9
--- /dev/null
+++ b/source/web/WEB-INF/web-application-context.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
+<!-- Top-level imports of XML configuration -->
+<beans>
+    <import resource="classpath:alfresco/application-context.xml" />
+    <import resource="classpath:alfresco/webscript-framework-application-context.xml" />
+    <import resource="classpath:alfresco/web-client-application-context.xml" />
+    <import resource="classpath:alfresco/web-scripts-application-context.xml" />
+    <import resource="classpath*:alfresco/enterprise-web-scripts-application-context.xml" />
+    <import resource="classpath:alfresco/web-services-application-context.xml" />
+    <!--
+        To give final control over the tuning of the custom environment, the custom-web-context.xml file is processed
+        last (note: custom-web-context.xml isn't part of the source tree itself).
+    -->
+    <import resource="classpath*:alfresco/extension/custom-web-context.xml" />
+</beans>
\ No newline at end of file
diff --git a/source/web/WEB-INF/web.xml b/source/web/WEB-INF/web.xml
index a03023a799..8723562dd6 100644
--- a/source/web/WEB-INF/web.xml
+++ b/source/web/WEB-INF/web.xml
@@ -67,22 +67,13 @@
 
    <context-param>
       <param-name>contextConfigLocation</param-name>
-      <param-value>
-         classpath:alfresco/application-context.xml
-         classpath:alfresco/webscript-framework-application-context.xml
-         classpath:alfresco/web-client-application-context.xml
-         classpath:alfresco/web-scripts-application-context.xml
-         classpath:alfresco/web-services-application-context.xml
-
-         <!--
-         To give final control over the tuning of the custom environment,
-         the custom-web-context.xml file is processed last (note:
-         custom-web-context.xml isn't part of the source tree itself).
-         -->
-         classpath*:alfresco/extension/custom-web-context.xml
-
-      </param-value>
-      <description>Spring config file locations</description>
+      <param-value>/WEB-INF/web-application-context.xml</param-value>
+      <description>Spring config file location</description>
+   </context-param>
+   <context-param>
+      <param-name>log4jExposeWebAppRoot</param-name>
+      <param-value>false</param-value>
+      <description>Do not try to resolve web app root as file</description>
    </context-param>
 
 	<!--  These were previously init params for the WebDAV servlet,