Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
===================================================================
diff -u -rb65ddbfc914cafd2a6c682dce8faafd9f7de7747 -r37c1972aaf34449bc4d3741c87b49f666840ebcb
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	(.../AssessmentServiceImpl.java)	(revision b65ddbfc914cafd2a6c682dce8faafd9f7de7747)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	(.../AssessmentServiceImpl.java)	(revision 37c1972aaf34449bc4d3741c87b49f666840ebcb)
@@ -293,9 +293,6 @@
     @Override
     public Assessment getAssessmentByContentId(Long contentId) {
 	Assessment rs = assessmentDao.getByContentId(contentId);
-	if (rs == null) {
-	    AssessmentServiceImpl.log.debug("Could not find the content by given ID:" + contentId);
-	}
 	return rs;
     }
 
Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java
===================================================================
diff -u -ra0bce7961a19548c58f5b0025160f124785f9951 -r37c1972aaf34449bc4d3741c87b49f666840ebcb
--- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java	(.../DacoServiceImpl.java)	(revision a0bce7961a19548c58f5b0025160f124785f9951)
+++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java	(.../DacoServiceImpl.java)	(revision 37c1972aaf34449bc4d3741c87b49f666840ebcb)
@@ -273,9 +273,6 @@
     @Override
     public Daco getDacoByContentId(Long contentId) {
 	Daco daco = dacoDao.getByContentId(contentId);
-	if (daco == null) {
-	    DacoServiceImpl.log.debug("Could not find the content by given ID:" + contentId);
-	}
 	return daco;
     }
 
Index: lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/service/EadventureServiceImpl.java
===================================================================
diff -u -ra0bce7961a19548c58f5b0025160f124785f9951 -r37c1972aaf34449bc4d3741c87b49f666840ebcb
--- lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/service/EadventureServiceImpl.java	(.../EadventureServiceImpl.java)	(revision a0bce7961a19548c58f5b0025160f124785f9951)
+++ lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/service/EadventureServiceImpl.java	(.../EadventureServiceImpl.java)	(revision 37c1972aaf34449bc4d3741c87b49f666840ebcb)
@@ -246,9 +246,6 @@
 
     public Eadventure getEadventureByContentId(Long contentId) {
 	Eadventure rs = eadventureDao.getByContentId(contentId);
-	if (rs == null) {
-	    EadventureServiceImpl.log.debug("Could not find the content by given ID:" + contentId);
-	}
 	return rs;
     }
 
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java
===================================================================
diff -u -ra0bce7961a19548c58f5b0025160f124785f9951 -r37c1972aaf34449bc4d3741c87b49f666840ebcb
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java	(.../ImageGalleryServiceImpl.java)	(revision a0bce7961a19548c58f5b0025160f124785f9951)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java	(.../ImageGalleryServiceImpl.java)	(revision 37c1972aaf34449bc4d3741c87b49f666840ebcb)
@@ -169,9 +169,6 @@
     @Override
     public ImageGallery getImageGalleryByContentId(Long contentId) {
 	ImageGallery rs = imageGalleryDao.getByContentId(contentId);
-	if (rs == null) {
-	    ImageGalleryServiceImpl.log.debug("Could not find the content by given ID:" + contentId);
-	}
 	return rs;
     }
 
Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java
===================================================================
diff -u -ra0bce7961a19548c58f5b0025160f124785f9951 -r37c1972aaf34449bc4d3741c87b49f666840ebcb
--- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java	(.../CommonCartridgeServiceImpl.java)	(revision a0bce7961a19548c58f5b0025160f124785f9951)
+++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java	(.../CommonCartridgeServiceImpl.java)	(revision 37c1972aaf34449bc4d3741c87b49f666840ebcb)
@@ -229,9 +229,6 @@
 
     public CommonCartridge getCommonCartridgeByContentId(Long contentId) {
 	CommonCartridge rs = commonCartridgeDao.getByContentId(contentId);
-	if (rs == null) {
-	    CommonCartridgeServiceImpl.log.debug("Could not find the content by given ID:" + contentId);
-	}
 	return rs;
     }
 
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java
===================================================================
diff -u -ra0bce7961a19548c58f5b0025160f124785f9951 -r37c1972aaf34449bc4d3741c87b49f666840ebcb
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java	(.../ResourceServiceImpl.java)	(revision a0bce7961a19548c58f5b0025160f124785f9951)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java	(.../ResourceServiceImpl.java)	(revision 37c1972aaf34449bc4d3741c87b49f666840ebcb)
@@ -236,9 +236,6 @@
     @Override
     public Resource getResourceByContentId(Long contentId) {
 	Resource rs = resourceDao.getByContentId(contentId);
-	if (rs == null) {
-	    ResourceServiceImpl.log.debug("Could not find the content by given ID:" + contentId);
-	}
 	return rs;
     }
 
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java
===================================================================
diff -u -ra0bce7961a19548c58f5b0025160f124785f9951 -r37c1972aaf34449bc4d3741c87b49f666840ebcb
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java	(.../SubmitFilesService.java)	(revision a0bce7961a19548c58f5b0025160f124785f9951)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java	(.../SubmitFilesService.java)	(revision 37c1972aaf34449bc4d3741c87b49f666840ebcb)
@@ -361,9 +361,6 @@
 	} catch (Exception e) {
 	    SubmitFilesService.log.error("Could not find the content by given ID:" + contentID + ". Excpetion is " + e);
 	}
-	if (content == null) {
-	    SubmitFilesService.log.error("Could not find the content by given ID:" + contentID);
-	}
 
 	return content;
     }
@@ -490,7 +487,6 @@
 	}
     }
 
-    /** Remove a tool session. The session parameter must not be null. */
     private void removeToolSession(SubmitFilesSession session) {
 	Set filesUploaded = session.getSubmissionDetails();
 	if (filesUploaded != null) {
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
===================================================================
diff -u -ra0bce7961a19548c58f5b0025160f124785f9951 -r37c1972aaf34449bc4d3741c87b49f666840ebcb
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java	(.../ScratchieServiceImpl.java)	(revision a0bce7961a19548c58f5b0025160f124785f9951)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java	(.../ScratchieServiceImpl.java)	(revision 37c1972aaf34449bc4d3741c87b49f666840ebcb)
@@ -156,9 +156,6 @@
     @Override
     public Scratchie getScratchieByContentId(Long contentId) {
 	Scratchie rs = scratchieDao.getByContentId(contentId);
-	if (rs == null) {
-	    ScratchieServiceImpl.log.debug("Could not find the content by given ID:" + contentId);
-	}
 	return rs;
     }
 
Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java
===================================================================
diff -u -ra0bce7961a19548c58f5b0025160f124785f9951 -r37c1972aaf34449bc4d3741c87b49f666840ebcb
--- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java	(.../SpreadsheetServiceImpl.java)	(revision a0bce7961a19548c58f5b0025160f124785f9951)
+++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java	(.../SpreadsheetServiceImpl.java)	(revision 37c1972aaf34449bc4d3741c87b49f666840ebcb)
@@ -121,9 +121,6 @@
 
     public Spreadsheet getSpreadsheetByContentId(Long contentId) {
 	Spreadsheet rs = spreadsheetDao.getByContentId(contentId);
-	if (rs == null) {
-	    SpreadsheetServiceImpl.log.debug("Could not find the content by given ID:" + contentId);
-	}
 	return rs;
     }
 
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java
===================================================================
diff -u -rd2d2dd3195cf85fb613fb81360622b6493db9116 -r37c1972aaf34449bc4d3741c87b49f666840ebcb
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java	(.../SurveyServiceImpl.java)	(revision d2d2dd3195cf85fb613fb81360622b6493db9116)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java	(.../SurveyServiceImpl.java)	(revision 37c1972aaf34449bc4d3741c87b49f666840ebcb)
@@ -143,9 +143,6 @@
     @Override
     public Survey getSurveyByContentId(Long contentId) {
 	Survey rs = surveyDao.getByContentId(contentId);
-	if (rs == null) {
-	    SurveyServiceImpl.log.debug("Could not find the content by given ID:" + contentId);
-	}
 	return rs;
     }
 
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java
===================================================================
diff -u -ra0bce7961a19548c58f5b0025160f124785f9951 -r37c1972aaf34449bc4d3741c87b49f666840ebcb
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java	(.../TaskListServiceImpl.java)	(revision a0bce7961a19548c58f5b0025160f124785f9951)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java	(.../TaskListServiceImpl.java)	(revision 37c1972aaf34449bc4d3741c87b49f666840ebcb)
@@ -121,9 +121,6 @@
     @Override
     public TaskList getTaskListByContentId(Long contentId) {
 	TaskList rs = taskListDao.getByContentId(contentId);
-	if (rs == null) {
-	    TaskListServiceImpl.log.debug("Could not find the content by given ID:" + contentId);
-	}
 	return rs;
     }