Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
===================================================================
diff -u -r3bd875e627926fa28464fc7da8f10caacf9e2351 -rc5484257b0ba0781664b96098573178c6e5b0544
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java	(.../MonitoringService.java)	(revision 3bd875e627926fa28464fc7da8f10caacf9e2351)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java	(.../MonitoringService.java)	(revision c5484257b0ba0781664b96098573178c6e5b0544)
@@ -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());