Index: lams_central/src/java/org/lamsfoundation/lams/web/LAMSUploadServlet.java
===================================================================
diff -u -r9367000b12e2272e6e0756d91ae1fdd5d7d4a220 -rdf6e66a4321a9fa64d6903fe642266ec65cd9c4b
--- lams_central/src/java/org/lamsfoundation/lams/web/LAMSUploadServlet.java	(.../LAMSUploadServlet.java)	(revision 9367000b12e2272e6e0756d91ae1fdd5d7d4a220)
+++ lams_central/src/java/org/lamsfoundation/lams/web/LAMSUploadServlet.java	(.../LAMSUploadServlet.java)	(revision df6e66a4321a9fa64d6903fe642266ec65cd9c4b)
@@ -218,7 +218,7 @@
 
 	    out.println("<script type=\"text/javascript\">");
 	    out.println("this.parent.CKEDITOR.tools.callFunction(" + ckeditorSetUrlFuncNum + ",'" + fileUrl + "','"
-		    + returnMessage + "');");
+		    + (returnMessage == null ? "" : returnMessage) + "');");
 	    out.println("</script>");
 	    out.flush();
 	    out.close();