diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpSendingMessageHandlerFactoryBean.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpSendingMessageHandlerFactoryBean.java
index 626183e6e8..7bcb02d1d7 100644
--- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpSendingMessageHandlerFactoryBean.java
+++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/FtpSendingMessageHandlerFactoryBean.java
@@ -66,7 +66,10 @@ class FtpSendingMessageHandlerFactoryBean extends AbstractFactoryBean<FtpSending
 		QueuedFtpClientPool queuedFtpClientPool = new QueuedFtpClientPool(15, this.clientFactory);
 		FtpSendingMessageHandler ftpSendingMessageHandler = new FtpSendingMessageHandler(
 				queuedFtpClientPool);
-		ftpSendingMessageHandler.setFileNameGenerator(this.fileNameGenerator);
+		if (this.fileNameGenerator != null){
+			ftpSendingMessageHandler.setFileNameGenerator(this.fileNameGenerator);
+		}
+	
 		if (this.charset != null) {
 			ftpSendingMessageHandler.setCharset(this.charset);
 		}
diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/outbound/FtpSendingMessageHandler.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/outbound/FtpSendingMessageHandler.java
index 90072ae61a..8670d18ab7 100644
--- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/outbound/FtpSendingMessageHandler.java
+++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/outbound/FtpSendingMessageHandler.java
@@ -93,9 +93,6 @@ public class FtpSendingMessageHandler extends AbstractMessageHandler{
 	}
 
 	private File handleFileMessage(File sourceFile, File tempFile, File resultFile) throws IOException {
-		if (sourceFile.renameTo(resultFile)) {
-			return resultFile;
-		}
 		FileCopyUtils.copy(sourceFile, tempFile);
 		tempFile.renameTo(resultFile);
 		return resultFile;