Index: lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
===================================================================
diff -u -re1d043273c818680748dbdb3e86d5d27710dae59 -r621f9a7d0d08f842aa5871d98f0f36855ad336c4
--- lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java	(.../AuthoringService.java)	(revision e1d043273c818680748dbdb3e86d5d27710dae59)
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java	(.../AuthoringService.java)	(revision 621f9a7d0d08f842aa5871d98f0f36855ad336c4)
@@ -1299,7 +1299,11 @@
 	/** @see org.lamsfoundation.lams.authoring.service.IAuthoringService#generateUniqueContentFolder() */
 	public String generateUniqueContentFolder() throws FileUtilException, IOException {
 		
-		return FileUtil.generateUniqueContentFolder();
+		String newUniqueContentFolderID = FileUtil.generateUniqueContentFolderID();
+		
+		FlashMessage flashMessage = new FlashMessage("createUniqueContentFolder", newUniqueContentFolderID);
+		
+		return flashMessage.serializeMessage();
 	}
 	
 	/** @see org.lamsfoundation.lams.authoring.service.IAuthoringService#getHelpURL() */
Index: lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java
===================================================================
diff -u -r39dcd86ca435bd8205fcdeb0cf6969a24cae0a96 -r621f9a7d0d08f842aa5871d98f0f36855ad336c4
--- lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java	(.../LamsToolService.java)	(revision 39dcd86ca435bd8205fcdeb0cf6969a24cae0a96)
+++ lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java	(.../LamsToolService.java)	(revision 621f9a7d0d08f842aa5871d98f0f36855ad336c4)
@@ -38,7 +38,6 @@
 import org.lamsfoundation.lams.util.FileUtil;
 import org.lamsfoundation.lams.util.FileUtilException;
 
-
 /**
  * 
  * @author Jacky Fang
@@ -104,7 +103,7 @@
 	
 	public String generateUniqueContentFolder() throws FileUtilException, IOException {
 		
-		return FileUtil.generateUniqueContentFolder();
+		return FileUtil.generateUniqueContentFolderID();
 		
 	}
 }
Index: lams_common/src/java/org/lamsfoundation/lams/util/FileUtil.java
===================================================================
diff -u -re1d043273c818680748dbdb3e86d5d27710dae59 -r621f9a7d0d08f842aa5871d98f0f36855ad336c4
--- lams_common/src/java/org/lamsfoundation/lams/util/FileUtil.java	(.../FileUtil.java)	(revision e1d043273c818680748dbdb3e86d5d27710dae59)
+++ lams_common/src/java/org/lamsfoundation/lams/util/FileUtil.java	(.../FileUtil.java)	(revision 621f9a7d0d08f842aa5871d98f0f36855ad336c4)
@@ -42,7 +42,6 @@
 import org.hibernate.id.Configurable;
 import org.hibernate.id.IdentifierGenerator;
 import org.hibernate.id.UUIDHexGenerator;
-import org.lamsfoundation.lams.util.wddx.FlashMessage;
 import org.lamsfoundation.lams.util.zipfile.ZipFileUtilException;
 import javax.mail.internet.MimeUtility;
 
@@ -594,7 +593,7 @@
 			return filename;
 		}
 		
-		public static String generateUniqueContentFolder() throws FileUtilException, IOException {
+		public static String generateUniqueContentFolderID() {
 			
 			String newUniqueContentFolderID = null;
 			Properties props = new Properties();
@@ -605,8 +604,6 @@
 			// lowercase to resolve OS issues
 			newUniqueContentFolderID = ((String) uuidGen.generate(null, null)).toLowerCase();
 			
-			FlashMessage flashMessage = new FlashMessage("createUniqueContentFolder", newUniqueContentFolderID);
-			
-			return flashMessage.serializeMessage();
+			return newUniqueContentFolderID;
 		}
 }