Index: lams_central/web/ckeditor/filemanager/browser/default/browser.html
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rc4e287d7ad3270750700d819ec360d0648ed2e5e
--- lams_central/web/ckeditor/filemanager/browser/default/browser.html	(.../browser.html)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/web/ckeditor/filemanager/browser/default/browser.html	(.../browser.html)	(revision c4e287d7ad3270750700d819ec360d0648ed2e5e)
@@ -77,6 +77,10 @@
 oConnector.CurrentFolder	= '/' ;
 //LDEV-4497 split content folder ID into dir structure of 2 characters each
 var designFolder = GetUrlParam( 'CurrentFolder' ).replace(new RegExp("[/\\-]", 'g'), "");
+//if trimmedFolder length is less than 12, supplement it with missing characters
+if (designFolder.length < 12) {
+	designFolder += "123456789012".substring(0, 12-designFolder.length);
+}
 var splitDesignFolder = "/";
 for (var charIndex = 0; charIndex < 6; charIndex++){
 	splitDesignFolder += designFolder[charIndex * 2] + designFolder[charIndex * 2  + 1] + "/";
Index: lams_common/src/java/org/lamsfoundation/lams/util/UploadFileUtil.java
===================================================================
diff -u -rfd067e2f01c881d99c717983bdeb4ce64df77db2 -rc4e287d7ad3270750700d819ec360d0648ed2e5e
--- lams_common/src/java/org/lamsfoundation/lams/util/UploadFileUtil.java	(.../UploadFileUtil.java)	(revision fd067e2f01c881d99c717983bdeb4ce64df77db2)
+++ lams_common/src/java/org/lamsfoundation/lams/util/UploadFileUtil.java	(.../UploadFileUtil.java)	(revision c4e287d7ad3270750700d819ec360d0648ed2e5e)
@@ -138,6 +138,11 @@
     private static String[] splitContentDir(String contentFolderID) {
 	String[] result = new String[6];
 	String trimmedFolder = contentFolderID.replace("-", "").replace("/", "");
+	//if trimmedFolder length is less than 12, supplement it with missing character
+	if (trimmedFolder.length() < 12) {
+	    trimmedFolder += "123456789012".substring(0, 12-trimmedFolder.length());
+	}
+	
 	for (int groupIndex = 0; groupIndex < 6; groupIndex++) {
 	    result[groupIndex] = "" + trimmedFolder.charAt(groupIndex * 2) + trimmedFolder.charAt(groupIndex * 2 + 1);
 	}