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.33 -r1.195.2.34
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java	25 Sep 2016 14:44:58 -0000	1.195.2.33
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java	25 Sep 2016 14:46:24 -0000	1.195.2.34
@@ -94,6 +94,7 @@
 import org.lamsfoundation.lams.tool.ToolContent;
 import org.lamsfoundation.lams.tool.ToolSession;
 import org.lamsfoundation.lams.tool.exception.LamsToolServiceException;
+import org.lamsfoundation.lams.tool.exception.ToolException;
 import org.lamsfoundation.lams.tool.service.ILamsCoreToolService;
 import org.lamsfoundation.lams.usermanagement.Organisation;
 import org.lamsfoundation.lams.usermanagement.Role;
@@ -115,7 +116,6 @@
 import org.quartz.Trigger;
 import org.quartz.TriggerBuilder;
 import org.quartz.TriggerKey;
-import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 
 /**
  * <p>
@@ -886,7 +886,7 @@
 		// delete content of each tool
 		try {
 		    lamsCoreToolService.notifyToolToDeleteContent(toolActivity);
-		} catch (NoSuchBeanDefinitionException e) {
+		} catch (ToolException e) {
 		    if (log.isDebugEnabled()) {
 			log.debug("Tried to remove content of a non-existent tool: "
 				+ toolActivity.getTool().getToolDisplayName());