diff --git a/spring-integration-java-dsl/src/main/java/org/springframework/integration/dsl/IntegrationFlowDefinition.java b/spring-integration-java-dsl/src/main/java/org/springframework/integration/dsl/IntegrationFlowDefinition.java
index fa3d2b2..fc72b9c 100644
--- a/spring-integration-java-dsl/src/main/java/org/springframework/integration/dsl/IntegrationFlowDefinition.java
+++ b/spring-integration-java-dsl/src/main/java/org/springframework/integration/dsl/IntegrationFlowDefinition.java
@@ -96,8 +96,10 @@ public abstract class IntegrationFlowDefinition<B extends IntegrationFlowDefinit
 	}
 
 	B addComponents(Collection<Object> components) {
-		for (Object component : components) {
-			this.integrationComponents.add(component);
+		if (components != null) {
+			for (Object component : components) {
+				this.integrationComponents.add(component);
+			}
 		}
 		return _this();
 	}
diff --git a/spring-integration-java-dsl/src/main/java/org/springframework/integration/dsl/core/IntegrationFlowBeanPostProcessor.java b/spring-integration-java-dsl/src/main/java/org/springframework/integration/dsl/core/IntegrationFlowBeanPostProcessor.java
index 46d30fb..636b9a9 100644
--- a/spring-integration-java-dsl/src/main/java/org/springframework/integration/dsl/core/IntegrationFlowBeanPostProcessor.java
+++ b/spring-integration-java-dsl/src/main/java/org/springframework/integration/dsl/core/IntegrationFlowBeanPostProcessor.java
@@ -71,7 +71,7 @@ public class IntegrationFlowBeanPostProcessor implements BeanPostProcessor, Bean
 			return processStandardIntegrationFlow((IntegrationFlowBuilder.StandardIntegrationFlow) bean, beanName);
 		}
 		else if (bean instanceof IntegrationFlow) {
-			return processLambdaIntegrationFlow((IntegrationFlow) bean, beanName);
+			return processIntegrationFlowImpl((IntegrationFlow) bean, beanName);
 		}
 		return bean;
 	}
@@ -175,7 +175,7 @@ public class IntegrationFlowBeanPostProcessor implements BeanPostProcessor, Bean
 		return flow;
 	}
 
-	private Object processLambdaIntegrationFlow(IntegrationFlow flow, String beanName) {
+	private Object processIntegrationFlowImpl(IntegrationFlow flow, String beanName) {
 		IntegrationFlowBuilder flowBuilder = IntegrationFlows.from(beanName + ".input");
 		flow.define(flowBuilder);
 		return processStandardIntegrationFlow(flowBuilder.get(), beanName);
diff --git a/spring-integration-java-dsl/src/main/java/org/springframework/integration/dsl/file/FileTransferringMessageHandlerSpec.java b/spring-integration-java-dsl/src/main/java/org/springframework/integration/dsl/file/FileTransferringMessageHandlerSpec.java
index ff74fee..85afa79 100644
--- a/spring-integration-java-dsl/src/main/java/org/springframework/integration/dsl/file/FileTransferringMessageHandlerSpec.java
+++ b/spring-integration-java-dsl/src/main/java/org/springframework/integration/dsl/file/FileTransferringMessageHandlerSpec.java
@@ -141,7 +141,7 @@ public abstract class FileTransferringMessageHandlerSpec<F, S extends FileTransf
 		if (this.defaultFileNameGenerator != null) {
 			return Collections.<Object>singletonList(this.defaultFileNameGenerator);
 		}
-		return Collections.<Object>emptyList();
+		return null;
 	}
 
 	@Override
diff --git a/spring-integration-java-dsl/src/main/java/org/springframework/integration/dsl/file/FileWritingMessageHandlerSpec.java b/spring-integration-java-dsl/src/main/java/org/springframework/integration/dsl/file/FileWritingMessageHandlerSpec.java
index 6c97aa8..2555478 100644
--- a/spring-integration-java-dsl/src/main/java/org/springframework/integration/dsl/file/FileWritingMessageHandlerSpec.java
+++ b/spring-integration-java-dsl/src/main/java/org/springframework/integration/dsl/file/FileWritingMessageHandlerSpec.java
@@ -96,7 +96,7 @@ public class FileWritingMessageHandlerSpec
 		if (this.defaultFileNameGenerator != null) {
 			return Collections.<Object>singletonList(this.defaultFileNameGenerator);
 		}
-		return Collections.<Object>emptyList();
+		return null;
 	}
 
 	@Override
diff --git a/spring-integration-java-dsl/src/main/java/org/springframework/integration/dsl/mail/ImapIdleChannelAdapterSpec.java b/spring-integration-java-dsl/src/main/java/org/springframework/integration/dsl/mail/ImapIdleChannelAdapterSpec.java
index 5453c6c..8325876 100644
--- a/spring-integration-java-dsl/src/main/java/org/springframework/integration/dsl/mail/ImapIdleChannelAdapterSpec.java
+++ b/spring-integration-java-dsl/src/main/java/org/springframework/integration/dsl/mail/ImapIdleChannelAdapterSpec.java
@@ -27,7 +27,7 @@ import javax.mail.Session;
 import org.aopalliance.aop.Advice;
 
 import org.springframework.integration.dsl.core.ComponentsRegistration;
-import org.springframework.integration.dsl.core.MessagingProducerSpec;
+import org.springframework.integration.dsl.core.MessageProducerSpec;
 import org.springframework.integration.dsl.support.PropertiesBuilder;
 import org.springframework.integration.dsl.support.PropertiesConfigurer;
 import org.springframework.integration.mail.ImapIdleChannelAdapter;
@@ -39,7 +39,7 @@ import org.springframework.integration.transaction.TransactionSynchronizationFac
  * @author Gary Russell
  */
 public class ImapIdleChannelAdapterSpec
-		extends MessagingProducerSpec<ImapIdleChannelAdapterSpec, ImapIdleChannelAdapter>
+		extends MessageProducerSpec<ImapIdleChannelAdapterSpec, ImapIdleChannelAdapter>
 		implements ComponentsRegistration {
 
 	private final ImapMailReceiver receiver;