diff --git a/cis/ReactOS.CustomRevisionAction/FtpClient.cs b/cis/ReactOS.CustomRevisionAction/FtpClient.cs
index 11b9634fc77..4ba09708a16 100644
--- a/cis/ReactOS.CustomRevisionAction/FtpClient.cs
+++ b/cis/ReactOS.CustomRevisionAction/FtpClient.cs
@@ -354,7 +354,21 @@ namespace ReactOS.CustomRevisionAction
 
 			return msg;
 		}
-		
+
+		public bool DirectoryExists(string directory)
+		{
+			try
+			{
+				ChangeDir(directory);
+				ChangeDir("..");
+				return true;
+			}
+			catch (FtpException)
+			{
+				return false;
+			}
+		}
+	
 		/// <summary>
 		/// Return the size of a file.
 		/// </summary>
diff --git a/cis/ReactOS.CustomRevisionAction/Main.cs b/cis/ReactOS.CustomRevisionAction/Main.cs
index 319b102429d..54c43198de2 100644
--- a/cis/ReactOS.CustomRevisionAction/Main.cs
+++ b/cis/ReactOS.CustomRevisionAction/Main.cs
@@ -193,7 +193,7 @@ namespace ReactOS.CustomRevisionAction
 			if (directory != "")
 				ftpClient.ChangeDir(directory);
 			/* Create destination directory if it does not already exist */
-			if (ftpClient.GetFileList(branch).Length < 1)
+			if (!ftpClient.DirectoryExists(branch))
 				ftpClient.MakeDir(branch);
 			ftpClient.ChangeDir(branch);
 			ftpClient.Upload(sourceFilename);