Index: /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/connector/ConnectorServlet.java
===================================================================
--- /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/connector/ConnectorServlet.java	(revision 1645)
+++ /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/connector/ConnectorServlet.java	(revision 1646)
@@ -55,5 +55,5 @@
  * directory. The allowed commands are:
  * <ul>
- * <li>GetFolders: Retri�ve the list of directory under the current folder
+ * <li>GetFolders: Retrieve the list of directory under the current folder
  * <li>GetFoldersAndFiles: Retrive the list of files and directory under the current folder
  * <li>CreateFolder: Create a new directory under the current folder
@@ -90,5 +90,5 @@
 	 * connector?Command=CommandName&Type=ResourceType&CurrentFolder=FolderPath<br>
 	 * <br>
-	 * It executes the command and then return the results to the client in XML format.
+	 * It executes the commands and then return the results to the client in XML format.
 	 * 
 	 */
@@ -199,5 +199,10 @@
 		UploadResponse ur = null;
 
-		if (!UtilsFile.isValidPath(currentFolderStr)) {
+		if (Utils.isEmpty(commandStr) || Utils.isEmpty(currentFolderStr)
+		        || Utils.isEmpty(typeStr))
+			ur = UploadResponse.UR_BAD_REQUEST;
+		else if (!commandStr.matches("(File|Quick)Upload"))
+			ur = UploadResponse.UR_SECURITY_ERROR;
+		else if (!UtilsFile.isValidPath(currentFolderStr)) {
 			ur = new UploadResponse(UploadResponse.EN_SECURITY_ERROR, null, null,
 			        "'currentFolderStr' isn't valid!");
@@ -205,11 +210,5 @@
 			ur = new UploadResponse(UploadResponse.EN_SECURITY_ERROR, null, null,
 			        "The current user isn't authorized for uploading files!");
-		} else if (Utils.isEmpty(commandStr) || Utils.isEmpty(currentFolderStr)
-		        || Utils.isEmpty(typeStr))
-			ur = UploadResponse.UR_BAD_REQUEST;
-		else if (!commandStr.matches("(File|Quick)Upload"))
-			ur = UploadResponse.UR_SECURITY_ERROR;
-		else {
-
+		} else {
 			String currentPath = constructTypeBasedFolderString(fileType, currentFolderStr, request);
 			File currentDirPath = new File(getServletContext().getRealPath(currentPath));