Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r0b910f1ef56a7bda8b7348bdda7c4cebf7f4d25f
--- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java	(.../ChatService.java)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java	(.../ChatService.java)	(revision 0b910f1ef56a7bda8b7348bdda7c4cebf7f4d25f)
@@ -290,8 +290,9 @@
 			throws DataMissingException, ToolException {
 		Chat chat = chatDAO.getByContentId(toolContentId);
 		if (chat == null)
-			throw new DataMissingException(
-					"Unable to find tool content by given id :" + toolContentId);
+			chat = getDefaultContent();
+		if (chat ==null )
+ 			throw new DataMissingException("Unable to find default content for the chat tool");
 
 		// set ResourceToolContentHandler as null to avoid copy file node in
 		// repository again.
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java
===================================================================
diff -u -r3fff7d0f1b22c07760dd15feba8e4804bb6e24d2 -r0b910f1ef56a7bda8b7348bdda7c4cebf7f4d25f
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java	(.../ForumService.java)	(revision 3fff7d0f1b22c07760dd15feba8e4804bb6e24d2)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java	(.../ForumService.java)	(revision 0b910f1ef56a7bda8b7348bdda7c4cebf7f4d25f)
@@ -671,7 +671,9 @@
 	public void exportToolContent(Long toolContentId, String rootPath) throws DataMissingException, ToolException {
 		Forum toolContentObj = forumDao.getByContentId(toolContentId);
  		if(toolContentObj == null)
- 			throw new DataMissingException("Unable to find tool content by given id :" + toolContentId);
+ 			toolContentObj = getDefaultForum();
+ 		if(toolContentObj == null)
+ 			throw new DataMissingException("Unable to find default content for the forum tool");
  		
  		//set ResourceToolContentHandler as null to avoid copy file node in repository again.
  		toolContentObj = Forum.newInstance(toolContentObj,toolContentId,null);
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java
===================================================================
diff -u -r0db83894504dc7652d3670a6ce496605b961faa1 -r0b910f1ef56a7bda8b7348bdda7c4cebf7f4d25f
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java	(.../QaServicePOJO.java)	(revision 0db83894504dc7652d3670a6ce496605b961faa1)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java	(.../QaServicePOJO.java)	(revision 0b910f1ef56a7bda8b7348bdda7c4cebf7f4d25f)
@@ -1423,8 +1423,12 @@
 
 	public void exportToolContent(Long toolContentID, String rootPath) throws DataMissingException, ToolException {
 		QaContent toolContentObj = qaDAO.getQaById(toolContentID);
+ 		if(toolContentObj == null) {
+ 			long defaultToolContentId = toolService.getToolDefaultContentIdBySignature(MY_SIGNATURE);
+ 			toolContentObj = retrieveQa(defaultToolContentId);
+ 		}
  		if(toolContentObj == null)
- 			throw new DataMissingException("Unable to find tool content by given id :" + toolContentID);
+ 			throw new DataMissingException("Unable to find default content for the question and answer tool");
  		
 		try {
 			//set ToolContentHandler as null to avoid copy file node in repository again.
@@ -2102,7 +2106,7 @@
     	toolContentObj.setContent(null);
     	toolContentObj.setReportTitle(null);
     	toolContentObj.setMonitoringReportTitle(null);
-    	toolContentObj.setSynchInMonitor(true); // don't know what this does but the default content has false
+    	toolContentObj.setSynchInMonitor(false); // doesn't appear to be used in LAMS 2.0
     	
     	Boolean bool;
 		try {
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java
===================================================================
diff -u -r7111e743c2c69bf0dbec886e2c101eba845b6df3 -r0b910f1ef56a7bda8b7348bdda7c4cebf7f4d25f
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java	(.../ResourceServiceImpl.java)	(revision 7111e743c2c69bf0dbec886e2c101eba845b6df3)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java	(.../ResourceServiceImpl.java)	(revision 0b910f1ef56a7bda8b7348bdda7c4cebf7f4d25f)
@@ -817,8 +817,15 @@
 	
 	public void exportToolContent(Long toolContentId, String rootPath) throws DataMissingException, ToolException {
 		Resource toolContentObj = resourceDao.getByContentId(toolContentId);
+ 		if(toolContentObj == null) {
+ 			try {
+				toolContentObj = getDefaultResource();
+			} catch (ResourceApplicationException e) {
+				throw new DataMissingException(e.getMessage());
+			}
+ 		}
  		if(toolContentObj == null)
- 			throw new DataMissingException("Unable to find tool content by given id :" + toolContentId);
+ 			throw new DataMissingException("Unable to find default content for the share resources tool");
  		
  		//set ResourceToolContentHandler as null to avoid copy file node in repository again.
  		toolContentObj = Resource.newInstance(toolContentObj,toolContentId,null);
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServicePOJO.java
===================================================================
diff -u -rd85446887b504b9f49585c11695ef67e6052edd9 -r0b910f1ef56a7bda8b7348bdda7c4cebf7f4d25f
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServicePOJO.java	(.../NoticeboardServicePOJO.java)	(revision d85446887b504b9f49585c11695ef67e6052edd9)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServicePOJO.java	(.../NoticeboardServicePOJO.java)	(revision 0b910f1ef56a7bda8b7348bdda7c4cebf7f4d25f)
@@ -917,8 +917,12 @@
 
 	public void exportToolContent(Long toolContentId, String rootPath) throws DataMissingException, ToolException {
 		NoticeboardContent toolContentObj = nbContentDAO.findNbContentById(toolContentId);
+ 		if(toolContentObj == null) {
+		    Long defaultContentId = getToolDefaultContentIdBySignature(NoticeboardConstants.TOOL_SIGNATURE);
+		    toolContentObj = retrieveNoticeboard(defaultContentId);
+ 		}
  		if(toolContentObj == null)
- 			throw new DataMissingException("Unable to find tool content by given id :" + toolContentId);
+ 			throw new DataMissingException("Unable to find default content for the noticeboard tool");
  		
 		try {
 			//set ResourceToolContentHandler as null to avoid copy file node in repository again.
Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r0b910f1ef56a7bda8b7348bdda7c4cebf7f4d25f
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java	(.../NotebookService.java)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java	(.../NotebookService.java)	(revision 0b910f1ef56a7bda8b7348bdda7c4cebf7f4d25f)
@@ -224,9 +224,11 @@
 	public void exportToolContent(Long toolContentId, String rootPath)
 			throws DataMissingException, ToolException {
 		Notebook notebook = notebookDAO.getByContentId(toolContentId);
+		if (notebook == null) {
+			notebook = getDefaultContent();
+		}
 		if (notebook == null)
-			throw new DataMissingException(
-					"Unable to find tool content by given id :" + toolContentId);
+ 			throw new DataMissingException("Unable to find default content for the notebook tool");
 
 		// set ResourceToolContentHandler as null to avoid copy file node in
 		// repository again.
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r0b910f1ef56a7bda8b7348bdda7c4cebf7f4d25f
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java	(.../SubmitFilesService.java)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java	(.../SubmitFilesService.java)	(revision 0b910f1ef56a7bda8b7348bdda7c4cebf7f4d25f)
@@ -262,8 +262,11 @@
  	public void exportToolContent(Long toolContentId , String toPath) throws ToolException, DataMissingException{
  		exportContentService.registerFileClassForExport(InstructionFiles.class.getName(),"uuID","versionID");
  		SubmitFilesContent toolContentObj = submitFilesContentDAO.getContentByID(toolContentId);
- 		if(toolContentObj == null)
- 			throw new DataMissingException("Unable to find tool content by given id :" + toolContentId);
+ 		if(toolContentObj == null) {
+ 			toolContentObj = getDefaultSubmit();
+ 		}
+ 	 	if(toolContentObj == null)
+ 			throw new DataMissingException("Unable to find default content for the submit files tool");
  		
  		//set toolContentHandler as null to avoid duplicate file node in repository.
  		toolContentObj = SubmitFilesContent.newInstance(toolContentObj,toolContentId,null);
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java
===================================================================
diff -u -r00759d7592ccc90e8769763524afb69546f641d4 -r0b910f1ef56a7bda8b7348bdda7c4cebf7f4d25f
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java	(.../VoteServicePOJO.java)	(revision 00759d7592ccc90e8769763524afb69546f641d4)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java	(.../VoteServicePOJO.java)	(revision 0b910f1ef56a7bda8b7348bdda7c4cebf7f4d25f)
@@ -1632,9 +1632,14 @@
 
 	public void exportToolContent(Long toolContentID, String rootPath) throws DataMissingException, ToolException {
 		VoteContent toolContentObj = voteContentDAO.findVoteContentById(toolContentID);
- 		if(toolContentObj == null)
- 			throw new DataMissingException("Unable to find tool content by given id :" + toolContentID);
+ 		if(toolContentObj == null) {
+ 			long defaultContentId=getToolDefaultContentIdBySignature(MY_SIGNATURE);
+ 			toolContentObj = voteContentDAO.findVoteContentById(defaultContentId);
+ 		}
  		
+		if(toolContentObj == null)
+ 			throw new DataMissingException("Unable to find default content for the voting tool");
+ 		
 		try {
 			//set ToolContentHandler as null to avoid copy file node in repository again.
 			toolContentObj = VoteContent.newInstance(null,toolContentObj,toolContentID);