Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java
===================================================================
diff -u -r4776ddffcd1c1253f24ea7699283a5bf16b318a1 -r4e72e54e81218219db8185f13e9c447095fea404
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java	(.../McUtils.java)	(revision 4776ddffcd1c1253f24ea7699283a5bf16b318a1)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java	(.../McUtils.java)	(revision 4e72e54e81218219db8185f13e9c447095fea404)
@@ -480,9 +480,12 @@
     	
     	McContent mcContent=mcService.retrieveMc(toolContentId);
     	logger.debug("mcContent:" + mcContent);
-    	mcContent.setDefineLater(value);
-    	logger.debug("defineLater has been set to true");
-    	mcService.saveMcContent(mcContent);
+    	if (mcContent != null)
+    	{
+    		mcContent.setDefineLater(value);
+        	logger.debug("defineLater has been set to true");
+        	mcService.saveMcContent(mcContent);	
+    	}
     }
 	
     
@@ -529,7 +532,6 @@
     {
     	request.getSession().removeAttribute(MY_SIGNATURE);
     	request.getSession().removeAttribute(DEFAULT_CONTENT_ID);
-    	request.getSession().removeAttribute(TOOL_SERVICE);
     	request.getSession().removeAttribute(ERROR_MCAPPLICATION);
     	request.getSession().removeAttribute(LOAD);
     	request.getSession().removeAttribute(LOAD_QUESTIONS);