Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java,v
diff -u -r1.195.2.32 -r1.195.2.33
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java	28 Jul 2016 16:11:31 -0000	1.195.2.32
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java	25 Sep 2016 14:44:58 -0000	1.195.2.33
@@ -115,6 +115,7 @@
 import org.quartz.Trigger;
 import org.quartz.TriggerBuilder;
 import org.quartz.TriggerKey;
+import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 
 /**
  * <p>
@@ -883,7 +884,14 @@
 	    if (activity.isToolActivity()) {
 		ToolActivity toolActivity = (ToolActivity) activity;
 		// delete content of each tool
-		lamsCoreToolService.notifyToolToDeleteContent(toolActivity);
+		try {
+		    lamsCoreToolService.notifyToolToDeleteContent(toolActivity);
+		} catch (NoSuchBeanDefinitionException e) {
+		    if (log.isDebugEnabled()) {
+			log.debug("Tried to remove content of a non-existent tool: "
+				+ toolActivity.getTool().getToolDisplayName());
+		    }
+		}
 		//  possible nonthreadsafe access to session!!!
 		lessonDAO.flush();
 		Long toolContentId = toolActivity.getToolContentId();