Index: lams_admin/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r1ab316c8f51d340b2e702dea7c3e55f76df61126 -rf5cac68eee89cdbfdd61ad933eeef72e78c31ba6
--- lams_admin/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 1ab316c8f51d340b2e702dea7c3e55f76df61126)
+++ lams_admin/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f5cac68eee89cdbfdd61ad933eeef72e78c31ba6)
@@ -63,7 +63,9 @@
 			</c:if>
 			<c:if test="${empty toolSessionId}">
 				<c:set var="toolForm" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
-				<c:set var="toolSessionId" value="${toolForm.toolSessionID}" />
+				<c:if test="${not empty toolForm}"> 
+				    <c:set var="toolSessionId"><c:catch var="exception">${toolForm.toolSessionID}</c:catch></c:set>
+				</c:if>
 			</c:if>
  			<c:if test="${empty toolSessionId}">
 				<c:if test="${empty sessionMapID}">
@@ -144,7 +146,6 @@
 						}
 					}
 				} else { // test for popup window
-					debugger;
 					showControlBar =  ( window.name.match("LearnerActivity") == null );
 				}
 
Index: lams_central/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rc045fd81f51f1f9fccf15f702a6f1b2c1da9fab3 -rf5cac68eee89cdbfdd61ad933eeef72e78c31ba6
--- lams_central/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision c045fd81f51f1f9fccf15f702a6f1b2c1da9fab3)
+++ lams_central/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f5cac68eee89cdbfdd61ad933eeef72e78c31ba6)
@@ -63,7 +63,9 @@
 			</c:if>
 			<c:if test="${empty toolSessionId}">
 				<c:set var="toolForm" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
-				<c:set var="toolSessionId" value="${toolForm.toolSessionID}" />
+				<c:if test="${not empty toolForm}"> 
+				    <c:set var="toolSessionId"><c:catch var="exception">${toolForm.toolSessionID}</c:catch></c:set>
+				</c:if>
 			</c:if>
  			<c:if test="${empty toolSessionId}">
 				<c:if test="${empty sessionMapID}">
Index: lams_learning/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rc045fd81f51f1f9fccf15f702a6f1b2c1da9fab3 -rf5cac68eee89cdbfdd61ad933eeef72e78c31ba6
--- lams_learning/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision c045fd81f51f1f9fccf15f702a6f1b2c1da9fab3)
+++ lams_learning/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f5cac68eee89cdbfdd61ad933eeef72e78c31ba6)
@@ -63,7 +63,9 @@
 			</c:if>
 			<c:if test="${empty toolSessionId}">
 				<c:set var="toolForm" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
-				<c:set var="toolSessionId" value="${toolForm.toolSessionID}" />
+				<c:if test="${not empty toolForm}"> 
+				    <c:set var="toolSessionId"><c:catch var="exception">${toolForm.toolSessionID}</c:catch></c:set>
+				</c:if>
 			</c:if>
  			<c:if test="${empty toolSessionId}">
 				<c:if test="${empty sessionMapID}">
Index: lams_monitoring/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rc045fd81f51f1f9fccf15f702a6f1b2c1da9fab3 -rf5cac68eee89cdbfdd61ad933eeef72e78c31ba6
--- lams_monitoring/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision c045fd81f51f1f9fccf15f702a6f1b2c1da9fab3)
+++ lams_monitoring/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f5cac68eee89cdbfdd61ad933eeef72e78c31ba6)
@@ -63,7 +63,9 @@
 			</c:if>
 			<c:if test="${empty toolSessionId}">
 				<c:set var="toolForm" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
-				<c:set var="toolSessionId" value="${toolForm.toolSessionID}" />
+				<c:if test="${not empty toolForm}"> 
+				    <c:set var="toolSessionId"><c:catch var="exception">${toolForm.toolSessionID}</c:catch></c:set>
+				</c:if>
 			</c:if>
  			<c:if test="${empty toolSessionId}">
 				<c:if test="${empty sessionMapID}">
Index: lams_tool_assessment/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rc045fd81f51f1f9fccf15f702a6f1b2c1da9fab3 -rf5cac68eee89cdbfdd61ad933eeef72e78c31ba6
--- lams_tool_assessment/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision c045fd81f51f1f9fccf15f702a6f1b2c1da9fab3)
+++ lams_tool_assessment/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f5cac68eee89cdbfdd61ad933eeef72e78c31ba6)
@@ -63,7 +63,9 @@
 			</c:if>
 			<c:if test="${empty toolSessionId}">
 				<c:set var="toolForm" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
-				<c:set var="toolSessionId" value="${toolForm.toolSessionID}" />
+				<c:if test="${not empty toolForm}"> 
+				    <c:set var="toolSessionId"><c:catch var="exception">${toolForm.toolSessionID}</c:catch></c:set>
+				</c:if>
 			</c:if>
  			<c:if test="${empty toolSessionId}">
 				<c:if test="${empty sessionMapID}">
Index: lams_tool_bbb/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rc045fd81f51f1f9fccf15f702a6f1b2c1da9fab3 -rf5cac68eee89cdbfdd61ad933eeef72e78c31ba6
--- lams_tool_bbb/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision c045fd81f51f1f9fccf15f702a6f1b2c1da9fab3)
+++ lams_tool_bbb/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f5cac68eee89cdbfdd61ad933eeef72e78c31ba6)
@@ -63,7 +63,9 @@
 			</c:if>
 			<c:if test="${empty toolSessionId}">
 				<c:set var="toolForm" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
-				<c:set var="toolSessionId" value="${toolForm.toolSessionID}" />
+				<c:if test="${not empty toolForm}"> 
+				    <c:set var="toolSessionId"><c:catch var="exception">${toolForm.toolSessionID}</c:catch></c:set>
+				</c:if>
 			</c:if>
  			<c:if test="${empty toolSessionId}">
 				<c:if test="${empty sessionMapID}">
Index: lams_tool_chat/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rc045fd81f51f1f9fccf15f702a6f1b2c1da9fab3 -rf5cac68eee89cdbfdd61ad933eeef72e78c31ba6
--- lams_tool_chat/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision c045fd81f51f1f9fccf15f702a6f1b2c1da9fab3)
+++ lams_tool_chat/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f5cac68eee89cdbfdd61ad933eeef72e78c31ba6)
@@ -63,7 +63,9 @@
 			</c:if>
 			<c:if test="${empty toolSessionId}">
 				<c:set var="toolForm" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
-				<c:set var="toolSessionId" value="${toolForm.toolSessionID}" />
+				<c:if test="${not empty toolForm}"> 
+				    <c:set var="toolSessionId"><c:catch var="exception">${toolForm.toolSessionID}</c:catch></c:set>
+				</c:if>
 			</c:if>
  			<c:if test="${empty toolSessionId}">
 				<c:if test="${empty sessionMapID}">
Index: lams_tool_daco/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rc045fd81f51f1f9fccf15f702a6f1b2c1da9fab3 -rf5cac68eee89cdbfdd61ad933eeef72e78c31ba6
--- lams_tool_daco/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision c045fd81f51f1f9fccf15f702a6f1b2c1da9fab3)
+++ lams_tool_daco/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f5cac68eee89cdbfdd61ad933eeef72e78c31ba6)
@@ -63,7 +63,9 @@
 			</c:if>
 			<c:if test="${empty toolSessionId}">
 				<c:set var="toolForm" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
-				<c:set var="toolSessionId" value="${toolForm.toolSessionID}" />
+				<c:if test="${not empty toolForm}"> 
+				    <c:set var="toolSessionId"><c:catch var="exception">${toolForm.toolSessionID}</c:catch></c:set>
+				</c:if>
 			</c:if>
  			<c:if test="${empty toolSessionId}">
 				<c:if test="${empty sessionMapID}">
Index: lams_tool_forum/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rc045fd81f51f1f9fccf15f702a6f1b2c1da9fab3 -rf5cac68eee89cdbfdd61ad933eeef72e78c31ba6
--- lams_tool_forum/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision c045fd81f51f1f9fccf15f702a6f1b2c1da9fab3)
+++ lams_tool_forum/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f5cac68eee89cdbfdd61ad933eeef72e78c31ba6)
@@ -63,7 +63,9 @@
 			</c:if>
 			<c:if test="${empty toolSessionId}">
 				<c:set var="toolForm" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
-				<c:set var="toolSessionId" value="${toolForm.toolSessionID}" />
+				<c:if test="${not empty toolForm}"> 
+				    <c:set var="toolSessionId"><c:catch var="exception">${toolForm.toolSessionID}</c:catch></c:set>
+				</c:if>
 			</c:if>
  			<c:if test="${empty toolSessionId}">
 				<c:if test="${empty sessionMapID}">
Index: lams_tool_gmap/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rc045fd81f51f1f9fccf15f702a6f1b2c1da9fab3 -rf5cac68eee89cdbfdd61ad933eeef72e78c31ba6
--- lams_tool_gmap/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision c045fd81f51f1f9fccf15f702a6f1b2c1da9fab3)
+++ lams_tool_gmap/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f5cac68eee89cdbfdd61ad933eeef72e78c31ba6)
@@ -63,7 +63,9 @@
 			</c:if>
 			<c:if test="${empty toolSessionId}">
 				<c:set var="toolForm" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
-				<c:set var="toolSessionId" value="${toolForm.toolSessionID}" />
+				<c:if test="${not empty toolForm}"> 
+				    <c:set var="toolSessionId"><c:catch var="exception">${toolForm.toolSessionID}</c:catch></c:set>
+				</c:if>
 			</c:if>
  			<c:if test="${empty toolSessionId}">
 				<c:if test="${empty sessionMapID}">
Index: lams_tool_images/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rc045fd81f51f1f9fccf15f702a6f1b2c1da9fab3 -rf5cac68eee89cdbfdd61ad933eeef72e78c31ba6
--- lams_tool_images/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision c045fd81f51f1f9fccf15f702a6f1b2c1da9fab3)
+++ lams_tool_images/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f5cac68eee89cdbfdd61ad933eeef72e78c31ba6)
@@ -63,7 +63,9 @@
 			</c:if>
 			<c:if test="${empty toolSessionId}">
 				<c:set var="toolForm" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
-				<c:set var="toolSessionId" value="${toolForm.toolSessionID}" />
+				<c:if test="${not empty toolForm}"> 
+				    <c:set var="toolSessionId"><c:catch var="exception">${toolForm.toolSessionID}</c:catch></c:set>
+				</c:if>
 			</c:if>
  			<c:if test="${empty toolSessionId}">
 				<c:if test="${empty sessionMapID}">
Index: lams_tool_imscc/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rc045fd81f51f1f9fccf15f702a6f1b2c1da9fab3 -rf5cac68eee89cdbfdd61ad933eeef72e78c31ba6
--- lams_tool_imscc/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision c045fd81f51f1f9fccf15f702a6f1b2c1da9fab3)
+++ lams_tool_imscc/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f5cac68eee89cdbfdd61ad933eeef72e78c31ba6)
@@ -63,7 +63,9 @@
 			</c:if>
 			<c:if test="${empty toolSessionId}">
 				<c:set var="toolForm" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
-				<c:set var="toolSessionId" value="${toolForm.toolSessionID}" />
+				<c:if test="${not empty toolForm}"> 
+				    <c:set var="toolSessionId"><c:catch var="exception">${toolForm.toolSessionID}</c:catch></c:set>
+				</c:if>
 			</c:if>
  			<c:if test="${empty toolSessionId}">
 				<c:if test="${empty sessionMapID}">
Index: lams_tool_kaltura/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rc045fd81f51f1f9fccf15f702a6f1b2c1da9fab3 -rf5cac68eee89cdbfdd61ad933eeef72e78c31ba6
--- lams_tool_kaltura/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision c045fd81f51f1f9fccf15f702a6f1b2c1da9fab3)
+++ lams_tool_kaltura/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f5cac68eee89cdbfdd61ad933eeef72e78c31ba6)
@@ -63,7 +63,9 @@
 			</c:if>
 			<c:if test="${empty toolSessionId}">
 				<c:set var="toolForm" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
-				<c:set var="toolSessionId" value="${toolForm.toolSessionID}" />
+				<c:if test="${not empty toolForm}"> 
+				    <c:set var="toolSessionId"><c:catch var="exception">${toolForm.toolSessionID}</c:catch></c:set>
+				</c:if>
 			</c:if>
  			<c:if test="${empty toolSessionId}">
 				<c:if test="${empty sessionMapID}">
Index: lams_tool_lamc/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rc045fd81f51f1f9fccf15f702a6f1b2c1da9fab3 -rf5cac68eee89cdbfdd61ad933eeef72e78c31ba6
--- lams_tool_lamc/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision c045fd81f51f1f9fccf15f702a6f1b2c1da9fab3)
+++ lams_tool_lamc/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f5cac68eee89cdbfdd61ad933eeef72e78c31ba6)
@@ -63,7 +63,9 @@
 			</c:if>
 			<c:if test="${empty toolSessionId}">
 				<c:set var="toolForm" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
-				<c:set var="toolSessionId" value="${toolForm.toolSessionID}" />
+				<c:if test="${not empty toolForm}"> 
+				    <c:set var="toolSessionId"><c:catch var="exception">${toolForm.toolSessionID}</c:catch></c:set>
+				</c:if>
 			</c:if>
  			<c:if test="${empty toolSessionId}">
 				<c:if test="${empty sessionMapID}">
Index: lams_tool_laqa/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rc045fd81f51f1f9fccf15f702a6f1b2c1da9fab3 -rf5cac68eee89cdbfdd61ad933eeef72e78c31ba6
--- lams_tool_laqa/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision c045fd81f51f1f9fccf15f702a6f1b2c1da9fab3)
+++ lams_tool_laqa/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f5cac68eee89cdbfdd61ad933eeef72e78c31ba6)
@@ -63,7 +63,9 @@
 			</c:if>
 			<c:if test="${empty toolSessionId}">
 				<c:set var="toolForm" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
-				<c:set var="toolSessionId" value="${toolForm.toolSessionID}" />
+				<c:if test="${not empty toolForm}"> 
+				    <c:set var="toolSessionId"><c:catch var="exception">${toolForm.toolSessionID}</c:catch></c:set>
+				</c:if>
 			</c:if>
  			<c:if test="${empty toolSessionId}">
 				<c:if test="${empty sessionMapID}">
Index: lams_tool_larsrc/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rc045fd81f51f1f9fccf15f702a6f1b2c1da9fab3 -rf5cac68eee89cdbfdd61ad933eeef72e78c31ba6
--- lams_tool_larsrc/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision c045fd81f51f1f9fccf15f702a6f1b2c1da9fab3)
+++ lams_tool_larsrc/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f5cac68eee89cdbfdd61ad933eeef72e78c31ba6)
@@ -63,7 +63,9 @@
 			</c:if>
 			<c:if test="${empty toolSessionId}">
 				<c:set var="toolForm" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
-				<c:set var="toolSessionId" value="${toolForm.toolSessionID}" />
+				<c:if test="${not empty toolForm}"> 
+				    <c:set var="toolSessionId"><c:catch var="exception">${toolForm.toolSessionID}</c:catch></c:set>
+				</c:if>
 			</c:if>
  			<c:if test="${empty toolSessionId}">
 				<c:if test="${empty sessionMapID}">
Index: lams_tool_leader/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rc045fd81f51f1f9fccf15f702a6f1b2c1da9fab3 -rf5cac68eee89cdbfdd61ad933eeef72e78c31ba6
--- lams_tool_leader/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision c045fd81f51f1f9fccf15f702a6f1b2c1da9fab3)
+++ lams_tool_leader/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f5cac68eee89cdbfdd61ad933eeef72e78c31ba6)
@@ -63,7 +63,9 @@
 			</c:if>
 			<c:if test="${empty toolSessionId}">
 				<c:set var="toolForm" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
-				<c:set var="toolSessionId" value="${toolForm.toolSessionID}" />
+				<c:if test="${not empty toolForm}"> 
+				    <c:set var="toolSessionId"><c:catch var="exception">${toolForm.toolSessionID}</c:catch></c:set>
+				</c:if>
 			</c:if>
  			<c:if test="${empty toolSessionId}">
 				<c:if test="${empty sessionMapID}">
Index: lams_tool_mindmap/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rc045fd81f51f1f9fccf15f702a6f1b2c1da9fab3 -rf5cac68eee89cdbfdd61ad933eeef72e78c31ba6
--- lams_tool_mindmap/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision c045fd81f51f1f9fccf15f702a6f1b2c1da9fab3)
+++ lams_tool_mindmap/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f5cac68eee89cdbfdd61ad933eeef72e78c31ba6)
@@ -63,7 +63,9 @@
 			</c:if>
 			<c:if test="${empty toolSessionId}">
 				<c:set var="toolForm" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
-				<c:set var="toolSessionId" value="${toolForm.toolSessionID}" />
+				<c:if test="${not empty toolForm}"> 
+				    <c:set var="toolSessionId"><c:catch var="exception">${toolForm.toolSessionID}</c:catch></c:set>
+				</c:if>
 			</c:if>
  			<c:if test="${empty toolSessionId}">
 				<c:if test="${empty sessionMapID}">
Index: lams_tool_nb/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rc045fd81f51f1f9fccf15f702a6f1b2c1da9fab3 -rf5cac68eee89cdbfdd61ad933eeef72e78c31ba6
--- lams_tool_nb/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision c045fd81f51f1f9fccf15f702a6f1b2c1da9fab3)
+++ lams_tool_nb/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f5cac68eee89cdbfdd61ad933eeef72e78c31ba6)
@@ -63,7 +63,9 @@
 			</c:if>
 			<c:if test="${empty toolSessionId}">
 				<c:set var="toolForm" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
-				<c:set var="toolSessionId" value="${toolForm.toolSessionID}" />
+				<c:if test="${not empty toolForm}"> 
+				    <c:set var="toolSessionId"><c:catch var="exception">${toolForm.toolSessionID}</c:catch></c:set>
+				</c:if>
 			</c:if>
  			<c:if test="${empty toolSessionId}">
 				<c:if test="${empty sessionMapID}">
Index: lams_tool_notebook/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rc045fd81f51f1f9fccf15f702a6f1b2c1da9fab3 -rf5cac68eee89cdbfdd61ad933eeef72e78c31ba6
--- lams_tool_notebook/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision c045fd81f51f1f9fccf15f702a6f1b2c1da9fab3)
+++ lams_tool_notebook/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f5cac68eee89cdbfdd61ad933eeef72e78c31ba6)
@@ -63,7 +63,9 @@
 			</c:if>
 			<c:if test="${empty toolSessionId}">
 				<c:set var="toolForm" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
-				<c:set var="toolSessionId" value="${toolForm.toolSessionID}" />
+				<c:if test="${not empty toolForm}"> 
+				    <c:set var="toolSessionId"><c:catch var="exception">${toolForm.toolSessionID}</c:catch></c:set>
+				</c:if>
 			</c:if>
  			<c:if test="${empty toolSessionId}">
 				<c:if test="${empty sessionMapID}">
Index: lams_tool_pixlr/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rc045fd81f51f1f9fccf15f702a6f1b2c1da9fab3 -rf5cac68eee89cdbfdd61ad933eeef72e78c31ba6
--- lams_tool_pixlr/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision c045fd81f51f1f9fccf15f702a6f1b2c1da9fab3)
+++ lams_tool_pixlr/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f5cac68eee89cdbfdd61ad933eeef72e78c31ba6)
@@ -63,7 +63,9 @@
 			</c:if>
 			<c:if test="${empty toolSessionId}">
 				<c:set var="toolForm" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
-				<c:set var="toolSessionId" value="${toolForm.toolSessionID}" />
+				<c:if test="${not empty toolForm}"> 
+				    <c:set var="toolSessionId"><c:catch var="exception">${toolForm.toolSessionID}</c:catch></c:set>
+				</c:if>
 			</c:if>
  			<c:if test="${empty toolSessionId}">
 				<c:if test="${empty sessionMapID}">
Index: lams_tool_preview/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rc045fd81f51f1f9fccf15f702a6f1b2c1da9fab3 -rf5cac68eee89cdbfdd61ad933eeef72e78c31ba6
--- lams_tool_preview/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision c045fd81f51f1f9fccf15f702a6f1b2c1da9fab3)
+++ lams_tool_preview/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f5cac68eee89cdbfdd61ad933eeef72e78c31ba6)
@@ -63,7 +63,9 @@
 			</c:if>
 			<c:if test="${empty toolSessionId}">
 				<c:set var="toolForm" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
-				<c:set var="toolSessionId" value="${toolForm.toolSessionID}" />
+				<c:if test="${not empty toolForm}"> 
+				    <c:set var="toolSessionId"><c:catch var="exception">${toolForm.toolSessionID}</c:catch></c:set>
+				</c:if>
 			</c:if>
  			<c:if test="${empty toolSessionId}">
 				<c:if test="${empty sessionMapID}">
Index: lams_tool_sbmt/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rc045fd81f51f1f9fccf15f702a6f1b2c1da9fab3 -rf5cac68eee89cdbfdd61ad933eeef72e78c31ba6
--- lams_tool_sbmt/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision c045fd81f51f1f9fccf15f702a6f1b2c1da9fab3)
+++ lams_tool_sbmt/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f5cac68eee89cdbfdd61ad933eeef72e78c31ba6)
@@ -63,7 +63,9 @@
 			</c:if>
 			<c:if test="${empty toolSessionId}">
 				<c:set var="toolForm" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
-				<c:set var="toolSessionId" value="${toolForm.toolSessionID}" />
+				<c:if test="${not empty toolForm}"> 
+				    <c:set var="toolSessionId"><c:catch var="exception">${toolForm.toolSessionID}</c:catch></c:set>
+				</c:if>
 			</c:if>
  			<c:if test="${empty toolSessionId}">
 				<c:if test="${empty sessionMapID}">
Index: lams_tool_scratchie/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rc045fd81f51f1f9fccf15f702a6f1b2c1da9fab3 -rf5cac68eee89cdbfdd61ad933eeef72e78c31ba6
--- lams_tool_scratchie/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision c045fd81f51f1f9fccf15f702a6f1b2c1da9fab3)
+++ lams_tool_scratchie/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f5cac68eee89cdbfdd61ad933eeef72e78c31ba6)
@@ -63,7 +63,9 @@
 			</c:if>
 			<c:if test="${empty toolSessionId}">
 				<c:set var="toolForm" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
-				<c:set var="toolSessionId" value="${toolForm.toolSessionID}" />
+				<c:if test="${not empty toolForm}"> 
+				    <c:set var="toolSessionId"><c:catch var="exception">${toolForm.toolSessionID}</c:catch></c:set>
+				</c:if>
 			</c:if>
  			<c:if test="${empty toolSessionId}">
 				<c:if test="${empty sessionMapID}">
Index: lams_tool_scribe/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rc045fd81f51f1f9fccf15f702a6f1b2c1da9fab3 -rf5cac68eee89cdbfdd61ad933eeef72e78c31ba6
--- lams_tool_scribe/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision c045fd81f51f1f9fccf15f702a6f1b2c1da9fab3)
+++ lams_tool_scribe/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f5cac68eee89cdbfdd61ad933eeef72e78c31ba6)
@@ -63,7 +63,9 @@
 			</c:if>
 			<c:if test="${empty toolSessionId}">
 				<c:set var="toolForm" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
-				<c:set var="toolSessionId" value="${toolForm.toolSessionID}" />
+				<c:if test="${not empty toolForm}"> 
+				    <c:set var="toolSessionId"><c:catch var="exception">${toolForm.toolSessionID}</c:catch></c:set>
+				</c:if>
 			</c:if>
  			<c:if test="${empty toolSessionId}">
 				<c:if test="${empty sessionMapID}">
Index: lams_tool_spreadsheet/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rc045fd81f51f1f9fccf15f702a6f1b2c1da9fab3 -rf5cac68eee89cdbfdd61ad933eeef72e78c31ba6
--- lams_tool_spreadsheet/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision c045fd81f51f1f9fccf15f702a6f1b2c1da9fab3)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f5cac68eee89cdbfdd61ad933eeef72e78c31ba6)
@@ -63,7 +63,9 @@
 			</c:if>
 			<c:if test="${empty toolSessionId}">
 				<c:set var="toolForm" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
-				<c:set var="toolSessionId" value="${toolForm.toolSessionID}" />
+				<c:if test="${not empty toolForm}"> 
+				    <c:set var="toolSessionId"><c:catch var="exception">${toolForm.toolSessionID}</c:catch></c:set>
+				</c:if>
 			</c:if>
  			<c:if test="${empty toolSessionId}">
 				<c:if test="${empty sessionMapID}">
Index: lams_tool_survey/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rc045fd81f51f1f9fccf15f702a6f1b2c1da9fab3 -rf5cac68eee89cdbfdd61ad933eeef72e78c31ba6
--- lams_tool_survey/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision c045fd81f51f1f9fccf15f702a6f1b2c1da9fab3)
+++ lams_tool_survey/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f5cac68eee89cdbfdd61ad933eeef72e78c31ba6)
@@ -63,7 +63,9 @@
 			</c:if>
 			<c:if test="${empty toolSessionId}">
 				<c:set var="toolForm" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
-				<c:set var="toolSessionId" value="${toolForm.toolSessionID}" />
+				<c:if test="${not empty toolForm}"> 
+				    <c:set var="toolSessionId"><c:catch var="exception">${toolForm.toolSessionID}</c:catch></c:set>
+				</c:if>
 			</c:if>
  			<c:if test="${empty toolSessionId}">
 				<c:if test="${empty sessionMapID}">
Index: lams_tool_task/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rc045fd81f51f1f9fccf15f702a6f1b2c1da9fab3 -rf5cac68eee89cdbfdd61ad933eeef72e78c31ba6
--- lams_tool_task/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision c045fd81f51f1f9fccf15f702a6f1b2c1da9fab3)
+++ lams_tool_task/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f5cac68eee89cdbfdd61ad933eeef72e78c31ba6)
@@ -63,7 +63,9 @@
 			</c:if>
 			<c:if test="${empty toolSessionId}">
 				<c:set var="toolForm" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
-				<c:set var="toolSessionId" value="${toolForm.toolSessionID}" />
+				<c:if test="${not empty toolForm}"> 
+				    <c:set var="toolSessionId"><c:catch var="exception">${toolForm.toolSessionID}</c:catch></c:set>
+				</c:if>
 			</c:if>
  			<c:if test="${empty toolSessionId}">
 				<c:if test="${empty sessionMapID}">
Index: lams_tool_vote/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rc045fd81f51f1f9fccf15f702a6f1b2c1da9fab3 -rf5cac68eee89cdbfdd61ad933eeef72e78c31ba6
--- lams_tool_vote/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision c045fd81f51f1f9fccf15f702a6f1b2c1da9fab3)
+++ lams_tool_vote/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f5cac68eee89cdbfdd61ad933eeef72e78c31ba6)
@@ -63,7 +63,9 @@
 			</c:if>
 			<c:if test="${empty toolSessionId}">
 				<c:set var="toolForm" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
-				<c:set var="toolSessionId" value="${toolForm.toolSessionID}" />
+				<c:if test="${not empty toolForm}"> 
+				    <c:set var="toolSessionId"><c:catch var="exception">${toolForm.toolSessionID}</c:catch></c:set>
+				</c:if>
 			</c:if>
  			<c:if test="${empty toolSessionId}">
 				<c:if test="${empty sessionMapID}">
Index: lams_tool_wiki/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rc045fd81f51f1f9fccf15f702a6f1b2c1da9fab3 -rf5cac68eee89cdbfdd61ad933eeef72e78c31ba6
--- lams_tool_wiki/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision c045fd81f51f1f9fccf15f702a6f1b2c1da9fab3)
+++ lams_tool_wiki/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f5cac68eee89cdbfdd61ad933eeef72e78c31ba6)
@@ -63,7 +63,9 @@
 			</c:if>
 			<c:if test="${empty toolSessionId}">
 				<c:set var="toolForm" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
-				<c:set var="toolSessionId" value="${toolForm.toolSessionID}" />
+				<c:if test="${not empty toolForm}"> 
+				    <c:set var="toolSessionId"><c:catch var="exception">${toolForm.toolSessionID}</c:catch></c:set>
+				</c:if>
 			</c:if>
  			<c:if test="${empty toolSessionId}">
 				<c:if test="${empty sessionMapID}">