Index: lams_tool_lamc/conf/language/lams/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/conf/language/lams/ApplicationResources.properties,v
diff -u -r1.21 -r1.22
--- lams_tool_lamc/conf/language/lams/ApplicationResources.properties	21 May 2008 08:43:16 -0000	1.21
+++ lams_tool_lamc/conf/language/lams/ApplicationResources.properties	4 Jun 2008 03:29:56 -0000	1.22
@@ -254,6 +254,7 @@
 label.authoring.instructions.col  =Instructions:
 label.instructions  =Instructions
 label.authoring.instructions  =Instructions
+error.monitoring.spreadsheet.download = An error occurred while preparing the marks spreadsheet for download.
 
 
 #======= End labels: Exported 248 labels for en AU =====
Index: lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties,v
diff -u -r1.20 -r1.21
--- lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties	21 May 2008 08:43:16 -0000	1.20
+++ lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties	4 Jun 2008 03:29:56 -0000	1.21
@@ -254,6 +254,7 @@
 label.authoring.instructions.col  =Instructions:
 label.instructions  =Instructions
 label.authoring.instructions  =Instructions
+error.monitoring.spreadsheet.download = An error occurred while preparing the marks spreadsheet for download. 
 
 
 #======= End labels: Exported 248 labels for en AU =====
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java,v
diff -u -r1.41 -r1.42
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java	16 May 2008 04:08:29 -0000	1.41
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java	4 Jun 2008 03:29:56 -0000	1.42
@@ -23,9 +23,8 @@
 package org.lamsfoundation.lams.tool.mc.web;
 
 import java.io.ByteArrayOutputStream;
-import java.io.OutputStream;
 import java.io.IOException;
-import java.io.PrintWriter;
+import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.LinkedList;
@@ -52,7 +51,6 @@
 import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
 import org.lamsfoundation.lams.tool.exception.ToolException;
 import org.lamsfoundation.lams.tool.mc.EditActivityDTO;
-import org.lamsfoundation.lams.tool.mc.ExportPortfolioDTO;
 import org.lamsfoundation.lams.tool.mc.McAppConstants;
 import org.lamsfoundation.lams.tool.mc.McApplicationException;
 import org.lamsfoundation.lams.tool.mc.McCandidateAnswersDTO;
@@ -142,13 +140,6 @@
 			path="/monitoring/editQuestionBox.jsp"
 			redirect="false"
 	    />
-
-
-	  	<forward
-		    name="errorList"
-	        path="/McErrorBox.jsp"
-		    redirect="false"
-	  	/>
 	</action>  
   
  * 
@@ -4678,6 +4669,7 @@
 		McContent mcContent = mcService.retrieveMc(new Long(toolContentID));
 		
 		String errors = null; 
+		OutputStream out = response.getOutputStream();
 		
 		try {
 			//construct download file response header
@@ -4687,17 +4679,16 @@
 			response.setContentType(mineType);
 			response.setHeader("Content-Disposition",header);
 
-			prepareSessionDataSpreadsheet(request, response, mcContent, mcService, messageService, currentMonitoredToolSession, response.getOutputStream());
+			prepareSessionDataSpreadsheet(request, response, mcContent, mcService, messageService, currentMonitoredToolSession, out);
 			
 		} catch (Exception e) {
 			log.error(e);
-			errors = new ActionMessage("monitoring.download.error", e.toString()).toString();
+			errors = getMessageService().getMessage("error.monitoring.spreadsheet.download") + " " + e;
 		}
 	
 		if(errors != null){
 			try {
-				PrintWriter out = response.getWriter();
-				out.write(errors);
+				out.write(errors.getBytes());
 				out.flush();
 			} catch (IOException e) {
 			}
Index: lams_tool_lamc/web/monitoring/SummaryContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/monitoring/SummaryContent.jsp,v
diff -u -r1.26 -r1.27
--- lams_tool_lamc/web/monitoring/SummaryContent.jsp	20 May 2008 02:04:27 -0000	1.26
+++ lams_tool_lamc/web/monitoring/SummaryContent.jsp	4 Jun 2008 03:29:56 -0000	1.27
@@ -56,7 +56,8 @@
 			<input type="hidden" name="isToolSessionChanged"/>
 				<table class="forms">
 				
-					<c:if test="${fn:length(mcGeneralMonitoringDTO.summaryToolSessions) > 2 }">
+					<c:choose>
+					<c:when test="${fn:length(mcGeneralMonitoringDTO.summaryToolSessions) > 2 }">
 						<%-- When grouping is not enabled, we have only 2 items in summaryToolSessions.  The main toolSession and 'All' --%>
 								
 						<tr> 
@@ -80,7 +81,11 @@
 								</select>									
 							</td> 
 						</tr>
-					</c:if>					
+					</c:when>
+					<c:otherwise>
+						<tr><td><input type="hidden" name="monitoredToolSessionId" value="All" /></td></tr>
+					</c:otherwise>
+					</c:choose>
 					
 		  	 		<c:set var="queIndex" scope="request" value="0"/>
 					<c:forEach var="currentDto" items="${listMonitoredAnswersContainerDto}">