Index: lams_tool_sbmt/web/WEB-INF/struts/struts-config.xml
===================================================================
diff -u -rcc9e4f5a2ded59de3f23baa5dda20c7867df1888 -rfaf64b3f7ac476bd6932d00a5ce8143a940d3943
--- lams_tool_sbmt/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision cc9e4f5a2ded59de3f23baa5dda20c7867df1888)
+++ lams_tool_sbmt/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision faf64b3f7ac476bd6932d00a5ce8143a940d3943)
@@ -68,10 +68,14 @@
   </form-beans>
 
   <!-- ========== Global Exceptions Definitions =================================== -->
-  <!--
-    Define your exceptions in a file called global-exceptions.xml and place
-    it in your merge directory.
-  -->
+  <global-exceptions>
+  <exception
+    handler="org.lamsfoundation.lams.web.util.CustomStrutsExceptionHandler"
+    key="error.system"
+    path="/error.jsp"
+    scope="request"
+    type="java.lang.Exception"/>
+</global-exceptions>
 
   <!-- ========== Global Forward Definitions =================================== -->
   <!--
@@ -180,11 +184,6 @@
       unknown="false"
       validate="true"
     >
-      <exception
-        key="authoring.exception"
-        type="org.lamsfoundation.lams.tool.sbmt.exception.SubmitFilesException"
-        path="/authoring/authoring.jsp"
-      />
       <forward
         name="success"
         path="/authoring/authoring.jsp"