Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java
===================================================================
diff -u -r667e7416274e8e410dac4f09ece2acb98426e25d -r09269276584f800f82533cb9238da1bb6b67bbf3
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java	(.../McServicePOJO.java)	(revision 667e7416274e8e410dac4f09ece2acb98426e25d)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java	(.../McServicePOJO.java)	(revision 09269276584f800f82533cb9238da1bb6b67bbf3)
@@ -1622,7 +1622,11 @@
     public String leaveToolSession(Long toolSessionId,Long learnerId) throws DataMissingException, ToolException 
     {
         logger.debug("start of leaveToolSession with toolSessionId:" + toolSessionId + " and learnerId:" + learnerId);
+        logger.debug("make sure learnerService is available. Is it?" + learnerService);
         
+        if (learnerService == null)
+			return "dummyNextUrl";
+        
         if (learnerId == null)
     	{
     		logger.error("learnerId is null");