diff --git a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binder/PartitionHandler.java b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binder/PartitionHandler.java
index 43990ec40..4bee24d87 100644
--- a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binder/PartitionHandler.java
+++ b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binder/PartitionHandler.java
@@ -60,6 +60,7 @@ public class PartitionHandler {
 			EvaluationContext evaluationContext,
 			PartitionSelectorStrategy partitionSelector,
 			DefaultBindingPropertiesAccessor properties, int partitionCount) {
+		Assert.notNull(beanFactory, "BeanFactory must not be null");
 		this.beanFactory = beanFactory;
 		this.evaluationContext = evaluationContext;
 		this.partitionSelector = partitionSelector == null