Index: lams_admin/web/WEB-INF/tags/Page.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.4 -r1.1.2.5
--- lams_admin/web/WEB-INF/tags/Page.tag	29 Jul 2016 04:03:59 -0000	1.1.2.4
+++ lams_admin/web/WEB-INF/tags/Page.tag	1 Aug 2016 01:10:16 -0000	1.1.2.5
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.9 -r1.1.2.10
--- lams_central/web/WEB-INF/tags/Page.tag	29 Jul 2016 04:16:44 -0000	1.1.2.9
+++ lams_central/web/WEB-INF/tags/Page.tag	1 Aug 2016 01:10:37 -0000	1.1.2.10
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.5 -r1.1.2.6
--- lams_learning/web/WEB-INF/tags/Page.tag	29 Jul 2016 04:19:19 -0000	1.1.2.5
+++ lams_learning/web/WEB-INF/tags/Page.tag	1 Aug 2016 01:10:57 -0000	1.1.2.6
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.4 -r1.1.2.5
--- lams_monitoring/web/WEB-INF/tags/Page.tag	29 Jul 2016 04:20:31 -0000	1.1.2.4
+++ lams_monitoring/web/WEB-INF/tags/Page.tag	1 Aug 2016 01:10:58 -0000	1.1.2.5
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.6 -r1.1.2.7
--- lams_tool_assessment/web/WEB-INF/tags/Page.tag	29 Jul 2016 04:20:25 -0000	1.1.2.6
+++ lams_tool_assessment/web/WEB-INF/tags/Page.tag	1 Aug 2016 01:11:11 -0000	1.1.2.7
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_bbb/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.7 -r1.1.2.8
--- lams_tool_bbb/web/WEB-INF/tags/Page.tag	29 Jul 2016 04:20:27 -0000	1.1.2.7
+++ lams_tool_bbb/web/WEB-INF/tags/Page.tag	1 Aug 2016 01:11:31 -0000	1.1.2.8
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.7 -r1.1.2.8
--- lams_tool_chat/web/WEB-INF/tags/Page.tag	29 Jul 2016 04:20:32 -0000	1.1.2.7
+++ lams_tool_chat/web/WEB-INF/tags/Page.tag	1 Aug 2016 01:11:32 -0000	1.1.2.8
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.6 -r1.1.2.7
--- lams_tool_daco/web/WEB-INF/tags/Page.tag	29 Jul 2016 04:20:23 -0000	1.1.2.6
+++ lams_tool_daco/web/WEB-INF/tags/Page.tag	1 Aug 2016 01:11:30 -0000	1.1.2.7
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.7 -r1.1.2.8
--- lams_tool_forum/web/WEB-INF/tags/Page.tag	29 Jul 2016 04:20:30 -0000	1.1.2.7
+++ lams_tool_forum/web/WEB-INF/tags/Page.tag	1 Aug 2016 01:11:59 -0000	1.1.2.8
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_gmap/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.7 -r1.1.2.8
--- lams_tool_gmap/web/WEB-INF/tags/Page.tag	29 Jul 2016 04:20:33 -0000	1.1.2.7
+++ lams_tool_gmap/web/WEB-INF/tags/Page.tag	1 Aug 2016 01:12:06 -0000	1.1.2.8
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.6 -r1.1.2.7
--- lams_tool_images/web/WEB-INF/tags/Page.tag	29 Jul 2016 04:20:28 -0000	1.1.2.6
+++ lams_tool_images/web/WEB-INF/tags/Page.tag	1 Aug 2016 01:13:40 -0000	1.1.2.7
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.6 -r1.1.2.7
--- lams_tool_imscc/web/WEB-INF/tags/Page.tag	29 Jul 2016 04:20:26 -0000	1.1.2.6
+++ lams_tool_imscc/web/WEB-INF/tags/Page.tag	1 Aug 2016 01:13:39 -0000	1.1.2.7
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_kaltura/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.6 -r1.1.2.7
--- lams_tool_kaltura/web/WEB-INF/tags/Page.tag	29 Jul 2016 04:20:29 -0000	1.1.2.6
+++ lams_tool_kaltura/web/WEB-INF/tags/Page.tag	1 Aug 2016 01:13:43 -0000	1.1.2.7
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.7 -r1.1.2.8
--- lams_tool_lamc/web/WEB-INF/tags/Page.tag	29 Jul 2016 04:20:26 -0000	1.1.2.7
+++ lams_tool_lamc/web/WEB-INF/tags/Page.tag	1 Aug 2016 01:13:38 -0000	1.1.2.8
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.8 -r1.1.2.9
--- lams_tool_laqa/web/WEB-INF/tags/Page.tag	29 Jul 2016 04:20:24 -0000	1.1.2.8
+++ lams_tool_laqa/web/WEB-INF/tags/Page.tag	1 Aug 2016 01:13:37 -0000	1.1.2.9
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.6 -r1.1.2.7
--- lams_tool_larsrc/web/WEB-INF/tags/Page.tag	29 Jul 2016 04:22:07 -0000	1.1.2.6
+++ lams_tool_larsrc/web/WEB-INF/tags/Page.tag	1 Aug 2016 01:13:46 -0000	1.1.2.7
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_leader/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.6 -r1.1.2.7
--- lams_tool_leader/web/WEB-INF/tags/Page.tag	29 Jul 2016 04:22:06 -0000	1.1.2.6
+++ lams_tool_leader/web/WEB-INF/tags/Page.tag	1 Aug 2016 01:13:45 -0000	1.1.2.7
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_mindmap/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.6 -r1.1.2.7
--- lams_tool_mindmap/web/WEB-INF/tags/Page.tag	29 Jul 2016 04:22:03 -0000	1.1.2.6
+++ lams_tool_mindmap/web/WEB-INF/tags/Page.tag	1 Aug 2016 01:13:36 -0000	1.1.2.7
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.7 -r1.1.2.8
--- lams_tool_nb/web/WEB-INF/tags/Page.tag	29 Jul 2016 04:22:09 -0000	1.1.2.7
+++ lams_tool_nb/web/WEB-INF/tags/Page.tag	1 Aug 2016 01:13:47 -0000	1.1.2.8
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.9 -r1.1.2.10
--- lams_tool_notebook/web/WEB-INF/tags/Page.tag	29 Jul 2016 04:22:05 -0000	1.1.2.9
+++ lams_tool_notebook/web/WEB-INF/tags/Page.tag	1 Aug 2016 01:13:44 -0000	1.1.2.10
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_pixlr/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.6 -r1.1.2.7
--- lams_tool_pixlr/web/WEB-INF/tags/Page.tag	29 Jul 2016 04:22:01 -0000	1.1.2.6
+++ lams_tool_pixlr/web/WEB-INF/tags/Page.tag	1 Aug 2016 01:13:35 -0000	1.1.2.7
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_preview/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.6 -r1.1.2.7
--- lams_tool_preview/web/WEB-INF/tags/Page.tag	29 Jul 2016 04:22:04 -0000	1.1.2.6
+++ lams_tool_preview/web/WEB-INF/tags/Page.tag	1 Aug 2016 01:13:41 -0000	1.1.2.7
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.7 -r1.1.2.8
--- lams_tool_sbmt/web/WEB-INF/tags/Page.tag	29 Jul 2016 04:22:07 -0000	1.1.2.7
+++ lams_tool_sbmt/web/WEB-INF/tags/Page.tag	1 Aug 2016 01:14:45 -0000	1.1.2.8
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.6 -r1.1.2.7
--- lams_tool_scratchie/web/WEB-INF/tags/Page.tag	29 Jul 2016 04:22:08 -0000	1.1.2.6
+++ lams_tool_scratchie/web/WEB-INF/tags/Page.tag	1 Aug 2016 01:14:46 -0000	1.1.2.7
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.7 -r1.1.2.8
--- lams_tool_scribe/web/WEB-INF/tags/Page.tag	29 Jul 2016 04:22:02 -0000	1.1.2.7
+++ lams_tool_scribe/web/WEB-INF/tags/Page.tag	1 Aug 2016 01:14:41 -0000	1.1.2.8
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.7 -r1.1.2.8
--- lams_tool_spreadsheet/web/WEB-INF/tags/Page.tag	29 Jul 2016 04:23:36 -0000	1.1.2.7
+++ lams_tool_spreadsheet/web/WEB-INF/tags/Page.tag	1 Aug 2016 01:14:44 -0000	1.1.2.8
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.7 -r1.1.2.8
--- lams_tool_survey/web/WEB-INF/tags/Page.tag	29 Jul 2016 04:23:34 -0000	1.1.2.7
+++ lams_tool_survey/web/WEB-INF/tags/Page.tag	1 Aug 2016 01:14:42 -0000	1.1.2.8
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_task/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.7 -r1.1.2.8
--- lams_tool_task/web/WEB-INF/tags/Page.tag	29 Jul 2016 04:23:35 -0000	1.1.2.7
+++ lams_tool_task/web/WEB-INF/tags/Page.tag	1 Aug 2016 01:14:43 -0000	1.1.2.8
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.7 -r1.1.2.8
--- lams_tool_vote/web/WEB-INF/tags/Page.tag	29 Jul 2016 04:23:35 -0000	1.1.2.7
+++ lams_tool_vote/web/WEB-INF/tags/Page.tag	1 Aug 2016 01:15:12 -0000	1.1.2.8
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wiki/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.7 -r1.1.2.8
--- lams_tool_wiki/web/WEB-INF/tags/Page.tag	29 Jul 2016 04:23:37 -0000	1.1.2.7
+++ lams_tool_wiki/web/WEB-INF/tags/Page.tag	1 Aug 2016 01:15:13 -0000	1.1.2.8
@@ -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}">