Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
===================================================================
diff -u -r5b0f0dde5f91d80e5beb0b2f5109c347bbb946f0 -r5bc9a56ca54cbc94c0dcac3953f04f4de27152c9
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java	(.../ExportToolContentService.java)	(revision 5b0f0dde5f91d80e5beb0b2f5109c347bbb946f0)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java	(.../ExportToolContentService.java)	(revision 5bc9a56ca54cbc94c0dcac3953f04f4de27152c9)
@@ -109,7 +109,6 @@
  */
 public class ExportToolContentService implements IExportToolContentService, ApplicationContextAware {
 	public static final String LEARNING_DESIGN_SERVICE_BEAN_NAME = "learningDesignService";
-	private static final String USER_SERVICE_BEAN_NAME = "userManagementService";
 	
 	//export tool content zip file prefix
 	public static final String EXPORT_TOOLCONTNET_ZIP_PREFIX = "lams_toolcontent_";
@@ -310,6 +309,9 @@
 			//The content will contain tool.xml and attachment files of tools from LAMS repository.
 			List<AuthoringActivityDTO> activities = ldDto.getActivities();
 			for(AuthoringActivityDTO activity : activities){
+				//skip non-tool activities
+				if(activity.getActivityTypeID().intValue() != Activity.TOOL_ACTIVITY_TYPE)
+					continue;
 				ToolContentManager contentManager = (ToolContentManager) findToolService(toolDAO.getToolByID(activity.getToolID()));
 				log.debug("Tool export content : " + activity.getTitle() +" by contentID :" + activity.getToolContentID());
 				try{
@@ -421,6 +423,10 @@
 			Map<Long,ToolContent> toolMapper = new HashMap<Long,ToolContent>();
 			List<AuthoringActivityDTO> activities = ldDto.getActivities();
 			for(AuthoringActivityDTO activity : activities){
+				//skip non-tool activities
+				if(activity.getActivityTypeID().intValue() != Activity.TOOL_ACTIVITY_TYPE)
+					continue;
+				
 				String toolPath = FileUtil.getFullPath(learningDesignPath,activity.getToolContentID().toString());
 				
 				//To create a new toolContent according to imported tool signature name.