Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java,v
diff -u -r1.98 -r1.99
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java	16 Nov 2006 01:17:05 -0000	1.98
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java	17 Dec 2006 18:10:26 -0000	1.99
@@ -126,6 +126,7 @@
     public static final String MAX_QUESTION_INDEX 						= "maxQuestionIndex";
     public static final String COPY_TOOL_CONTENT 						= "copyToolContent";
     public static final String REMOVE_TOOL_CONTENT 						= "removeToolContent";
+    public static final String SIMPLE_LEARNING_ERROR					= "simpleLearningError";
     
     public static final String DEFAULT_MCQ_TITLE 						= "MCQ";
     public static final String DEFAULT_MCQ_INSTRUCTIONS					= "Instructions";
@@ -296,6 +297,7 @@
     public static final String MAP_USER_RESPONSES						="mapUserResponses";
     public static final String MAP_MAIN_REPORT							="mapMainReport";
     public static final String MAP_STATS								="mapStats";
+    
         
     /*
      * Monitoring Mode constants
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java,v
diff -u -r1.64 -r1.65
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java	14 Dec 2006 02:05:28 -0000	1.64
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java	17 Dec 2006 18:10:28 -0000	1.65
@@ -1722,17 +1722,21 @@
 	    String passMarkApplicable=null;
 	    String userOverPassMark =null;
 
-    	passMarkApplicable=(String)sessionMap.get(PASSMARK_APPLICABLE);
-    	logger.debug("passMarkApplicable: " + passMarkApplicable);
+	    if (sessionMap != null)
+	        passMarkApplicable=(String)sessionMap.get(PASSMARK_APPLICABLE);
     	
+	    logger.debug("passMarkApplicable: " + passMarkApplicable);
+    	
     	if (passMarkApplicable == null)
     	{
 			logger.debug("reading request parameters");
 			passMarkApplicable=request.getParameter("passMarkApplicable");
 		 	logger.debug("passMarkApplicable: " + passMarkApplicable);
     	}
     	        
-    	userOverPassMark=(String)sessionMap.get(USER_OVER_PASSMARK);
+    	if (sessionMap != null)    	
+    	    userOverPassMark=(String)sessionMap.get(USER_OVER_PASSMARK);
+    	
 	 	logger.debug("userOverPassMark: " + userOverPassMark);
 	 	
     	if (userOverPassMark == null)
@@ -1742,18 +1746,29 @@
     	}
 
 
-    	mcGeneralLearnerFlowDTO.setPassMarkApplicable(passMarkApplicable);
-    	mcLearningForm.setPassMarkApplicable(passMarkApplicable);
-	    
-    	mcGeneralLearnerFlowDTO.setUserOverPassMark (userOverPassMark);
-    	mcLearningForm.setUserOverPassMark (userOverPassMark);
-
+    	if (passMarkApplicable != null)
+    	{
+        	mcGeneralLearnerFlowDTO.setPassMarkApplicable(passMarkApplicable);
+        	mcLearningForm.setPassMarkApplicable(passMarkApplicable);
+    	}
+    	    
+    	if (userOverPassMark != null)
+    	{
+        	mcGeneralLearnerFlowDTO.setUserOverPassMark (userOverPassMark);
+        	mcLearningForm.setUserOverPassMark (userOverPassMark);
+    	}
     	
-    	sessionMap.put(PASSMARK_APPLICABLE, passMarkApplicable);
-    	sessionMap.put(USER_OVER_PASSMARK, userOverPassMark);
-    	request.getSession().setAttribute(httpSessionID, sessionMap);
-    	
+    	if (sessionMap != null)
+    	{
+    	    if (passMarkApplicable != null)
+    	        sessionMap.put(PASSMARK_APPLICABLE, passMarkApplicable);
+    	    
+    	    if (userOverPassMark != null)
+    	        sessionMap.put(USER_OVER_PASSMARK, userOverPassMark);
+        	request.getSession().setAttribute(httpSessionID, sessionMap);        	
+    	}
 
+    	
 	    String totalMarksPossible=LearningUtil.getTotalMarksPossible(mcContent);
 	    logger.debug("totalMarksPossible: " + totalMarksPossible);
 	    mcGeneralLearnerFlowDTO.setTotalMarksPossible(totalMarksPossible);
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java,v
diff -u -r1.73 -r1.74
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java	2 Dec 2006 12:44:09 -0000	1.73
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java	17 Dec 2006 18:10:27 -0000	1.74
@@ -313,6 +313,9 @@
 		    if (mcQueUsr == null)
 		    {
 				logger.error("error.learner.required");
+				persistError(request,"error.learner.required");
+				logger.error("forwarding to: " + SIMPLE_LEARNING_ERROR);
+				return (mapping.findForward(SIMPLE_LEARNING_ERROR));
 		    }
 		    
 		    /* check whether the user's session really referrs to the session id passed to the url*/
Index: lams_tool_lamc/web/WEB-INF/struts-config.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/WEB-INF/struts-config.xml,v
diff -u -r1.57 -r1.58
--- lams_tool_lamc/web/WEB-INF/struts-config.xml	2 Oct 2006 01:59:54 -0000	1.57
+++ lams_tool_lamc/web/WEB-INF/struts-config.xml	17 Dec 2006 18:10:27 -0000	1.58
@@ -209,6 +209,13 @@
 		    redirect="false"
 	  	/>   
 	  	
+
+		<forward
+		    name="simpleLearningError"
+		    path="/learning/SimpleLearnerError.jsp"
+		    redirect="false"
+	  	/>   
+	  	
 	</action>  
 	
 	
Index: lams_tool_lamc/web/learning/SimpleLearnerError.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/learning/SimpleLearnerError.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_lamc/web/learning/SimpleLearnerError.jsp	17 Dec 2006 18:10:27 -0000	1.1
@@ -0,0 +1,59 @@
+<%-- 
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+License Information: http://lamsfoundation.org/licensing/lams/2.0/
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License version 2 as 
+  published by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+  USA
+
+  http://www.gnu.org/licenses/gpl.txt
+--%>
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+        "http://www.w3.org/TR/html4/strict.dtd">
+
+<%@ include file="/common/taglibs.jsp"%>
+
+<c:set var="lams">
+	<lams:LAMSURL />
+</c:set>
+<c:set var="tool">
+	<lams:WebAppURL />
+</c:set>
+
+<lams:html>
+<head>
+	<html:base />
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<lams:css />
+	<title><fmt:message key="label.learner.error" />
+	</title>
+</head>
+
+<body class="stripes">
+		<div id="content">
+			<div class="space-bottom-top align-right">
+				<%@ include file="/common/messages.jsp"%>
+			</div>
+		</div>
+	<div id="footer"></div>
+</body>
+</lams:html>
+
+
+
+
+
+
+
+