Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/Attic/QaResources.properties,v
diff -u -r1.7 -r1.8
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaResources.properties	13 Jul 2005 03:12:28 -0000	1.7
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaResources.properties	13 Jul 2005 23:50:53 -0000	1.8
@@ -82,6 +82,7 @@
 error.sessionId.numberFormatException		=Tool Activity Error! Can't continue. The toolSession id passed to the Tool Activity must be numerical.
 error.content.doesNotExist 					=Tool Activity Error! Can't continue. The content id passed to the Tool Activity does not refer to an existing content.
 error.toolSessions.doesNotExist				=Tool Activity Error! Can't continue. One of the toolsession ids passed to the Tool Activity does not refer to an existing tool session.
+error.toolSession.doesNotExist				=Tool Activity Error! Can't continue. The toolsession id passed to the Tool Activity does not refer to an existing tool session.
 error.content.onlyContentAndNoSessions		=A report can not be generated since no tool sessions has been passed to the Tool Activity.
 error.content.noToolSessions				=A report can not be generated since there has not been any student activity on this content.
 error.tab.contentId.required				=Sorry, the screen is not available. The Tool Activity requires a content id. 
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaExportPortfolioStarterAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/Attic/QaExportPortfolioStarterAction.java,v
diff -u -r1.5 -r1.6
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaExportPortfolioStarterAction.java	13 Jul 2005 07:35:24 -0000	1.5
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaExportPortfolioStarterAction.java	13 Jul 2005 23:50:59 -0000	1.6
@@ -41,6 +41,7 @@
 import org.lamsfoundation.lams.tool.qa.QaAppConstants;
 import org.lamsfoundation.lams.tool.qa.QaApplicationException;
 import org.lamsfoundation.lams.tool.qa.QaContent;
+import org.lamsfoundation.lams.tool.qa.QaSession;
 import org.lamsfoundation.lams.tool.qa.QaStringComparator;
 import org.lamsfoundation.lams.tool.qa.QaUtils;
 import org.lamsfoundation.lams.tool.qa.service.IQaService;
@@ -157,9 +158,19 @@
 				logger.debug("forwarding to: " + PORTFOLIO_REPORT);
 				return (mapping.findForward(PORTFOLIO_REPORT));
 			}
-			logger.debug("final toolSessionId :" + toolSessionId);
+			logger.debug("final toolSessionId before exists test :" + toolSessionId);
 		}
 		
+		QaSession qaSession=qaService.retrieveQaSessionOrNullById(toolSessionId.longValue());
+		if (qaSession == null)
+		{
+	    	persistError(request,"error.toolSession.doesNotExist");
+			request.setAttribute(USER_EXCEPTION_TOOLSESSION_DOESNOTEXIST, new Boolean(true));
+			logger.debug("forwarding to: " + PORTFOLIO_REPORT);
+			return (mapping.findForward(PORTFOLIO_REPORT));
+		}
+		logger.debug("final toolSessionId :" + toolSessionId);
+		
 		String strToolContentId="";
 		Long toolContentId=null;
 		
Index: lams_tool_laqa/web/portfolioReport.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/Attic/portfolioReport.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_laqa/web/portfolioReport.jsp	13 Jul 2005 07:35:24 -0000	1.3
+++ lams_tool_laqa/web/portfolioReport.jsp	13 Jul 2005 23:52:02 -0000	1.4
@@ -12,6 +12,7 @@
 				requestScope.userExceptionToolSessionIdRequired	== 'true' ||
 				requestScope.userExceptionContentIdRequired		== 'true' ||
 				requestScope.userExceptionNoToolSessions		== 'true' ||
+				requestScope.userExceptionToolSessionDoesNotExist == 'true' ||
 				requestScope.userExceptionContentDoesNotExist	== 'true' }"> 	
 		<table align=center> <!-- Dave to take off-->
 			<tr> <td class="error">   
@@ -20,14 +21,15 @@
 		</table>
 	</c:if>						
 	
-	<c:if test="${requestScope.userExceptionUserIdNotNumeric 	!= 'true' && 
-				  requestScope.userExceptionUserIdNotAvailable 	!= 'true' && 
-				  requestScope.userExceptionModeRequired 		!= 'true' &&
-				  requestScope.userExceptionNumberFormat 		!= 'true' &&
-  				  requestScope.userExceptionToolSessionIdRequired != 'true' &&
-				  requestScope.userExceptionContentIdRequired	  != 'true' &&
-				  requestScope.userExceptionNoToolSessions		  != 'true' &&				  
-				  requestScope.userExceptionContentDoesNotExist   != 'true' 
+	<c:if test="${requestScope.userExceptionUserIdNotNumeric 		!= 'true' && 
+				  requestScope.userExceptionUserIdNotAvailable 		!= 'true' && 
+				  requestScope.userExceptionModeRequired 			!= 'true' &&
+				  requestScope.userExceptionNumberFormat 			!= 'true' &&
+  				  requestScope.userExceptionToolSessionIdRequired 	!= 'true' &&
+				  requestScope.userExceptionContentIdRequired	  	!= 'true' &&
+				  requestScope.userExceptionNoToolSessions		  	!= 'true' &&
+  				  requestScope.userExceptionToolSessionDoesNotExist != 'true' &&
+				  requestScope.userExceptionContentDoesNotExist   	!= 'true' 
 				}"> 	
 		<table align=center> <!-- Dave to take off-->
 				<jsp:include page="groupsReport.jsp" />