Index: lams_build/lib/lams/lams.jar
===================================================================
diff -u -r206cb40e4252d7fb4c26b5468d2991d9a91812e5 -rb4afa75048185273ee61a4def2164134f343fda0
Binary files differ
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
===================================================================
diff -u -rf0b1688e337075cd06a3b830e45ddd51d6ba4fe0 -rb4afa75048185273ee61a4def2164134f343fda0
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java	(.../ExportToolContentService.java)	(revision f0b1688e337075cd06a3b830e45ddd51d6ba4fe0)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java	(.../ExportToolContentService.java)	(revision b4afa75048185273ee61a4def2164134f343fda0)
@@ -468,11 +468,11 @@
 				String secureDir = Configuration.get(ConfigurationKeys.LAMS_EAR_DIR) + File.separator + FileUtil.LAMS_WWW_DIR + File.separator + FileUtil.LAMS_WWW_SECURE_DIR;
 				String ldContentDir = FileUtil.getFullPath(secureDir,ldDto.getContentFolderID());
 				
-				if(FileUtil.directoryExist(ldContentDir)) {
-					log.debug("Create export Learning Design content target zip file. File name is " + targetContentZipFileName);
-					ZipFileUtil.createZipFile(targetContentZipFileName, ldContentDir, contentDir);
+				if(!FileUtil.isEmptyDirectory(ldContentDir)) {
+						log.debug("Create export Learning Design content target zip file. File name is " + targetContentZipFileName);
+						ZipFileUtil.createZipFile(targetContentZipFileName, ldContentDir, contentDir);
 				} else {
-					log.error("No such directory:" + ldContentDir);
+					log.error("No such directory (or empty directory):" + ldContentDir);
 				}
 				
 			} catch (Exception e) {
Index: lams_common/src/java/org/lamsfoundation/lams/util/FileUtil.java
===================================================================
diff -u -rc6e37fb79807b8924923288aaa975c9673a29b08 -rb4afa75048185273ee61a4def2164134f343fda0
--- lams_common/src/java/org/lamsfoundation/lams/util/FileUtil.java	(.../FileUtil.java)	(revision c6e37fb79807b8924923288aaa975c9673a29b08)
+++ lams_common/src/java/org/lamsfoundation/lams/util/FileUtil.java	(.../FileUtil.java)	(revision b4afa75048185273ee61a4def2164134f343fda0)
@@ -96,6 +96,22 @@
 	
 	}
 	
+	public static boolean isEmptyDirectory(String directoryName) throws FileUtilException {
+		
+		if(directoryName == null || directoryName.length() == 0)
+			throw new FileUtilException("A directory name must be specified");
+		
+		File dir = new File(directoryName);
+		if(dir.exists()) {
+			if(dir.listFiles().length > 0)
+				return false;
+			else 
+				return true;
+		}
+		
+		return true;
+	}
+	
 	/**
 	 * Create a temporary directory with the name in the form
 	 * lamstmp_timestamp_suffix inside the default temporary-file directory