Index: lams_learning/web/WEB-INF/struts/struts-config.xml
===================================================================
diff -u -r97049873e9f5a71cdb4e9286f82508040b597347 -r45d69b4410d4b912d7f5b0720e5a33bc63d572f5
--- lams_learning/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision 97049873e9f5a71cdb4e9286f82508040b597347)
+++ lams_learning/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision 45d69b4410d4b912d7f5b0720e5a33bc63d572f5)
@@ -44,10 +44,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 =================================== -->
   <global-forwards>
@@ -66,13 +70,6 @@
       unknown="false"
       validate="false"
     >
-      <exception
-        key="error.system.learner"
-        type="org.lamsfoundation.lams.learning.service.LearnerServiceException"
-        handler="org.lamsfoundation.lams.learning.util.CustomStrutsExceptionHandler"
-        path=".systemError"
-        scope="request"
-      />
       <forward
         name="viewGroup"
         path="/grouping.do?method=viewGrouping"
@@ -96,13 +93,6 @@
       unknown="false"
       validate="false"
     >
-      <exception
-        key="error.system.learner"
-        type="org.lamsfoundation.lams.learning.service.LearnerServiceException"
-        handler="org.lamsfoundation.lams.learning.util.CustomStrutsExceptionHandler"
-        path=".systemError"
-        scope="request"
-      />
       <forward
         name="displayActivity"
         path="/DisplayActivity.do"
@@ -188,13 +178,6 @@
       unknown="false"
       validate="false"
     >
-      <exception
-        key="error.system.learner"
-        type="org.lamsfoundation.lams.learning.service.LearnerServiceException"
-        handler="org.lamsfoundation.lams.learning.util.CustomStrutsExceptionHandler"
-        path=".systemError"
-        scope="request"
-      />
       <forward
         name="permissionGate"
         path=".permissionGate"
@@ -218,13 +201,6 @@
       unknown="false"
       validate="false"
     >
-      <exception
-        key="error.system.learner"
-        type="org.lamsfoundation.lams.learning.service.LearnerServiceException"
-        handler="org.lamsfoundation.lams.learning.util.CustomStrutsExceptionHandler"
-        path=".systemError"
-        scope="request"
-      />
       <forward
         name="controlActivity"
         path="/dummyControlFrame.jsp"
@@ -307,7 +283,9 @@
 <action path="/index"
 	type="org.apache.struts.actions.ForwardAction"
 	parameter="/main.jsp" />
-
+<action path="/close"
+	type="org.apache.struts.actions.ForwardAction"
+	parameter=".close" />
 <action path="/content"
 	type="org.apache.struts.actions.ForwardAction"
 	parameter=".welcome" />