diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/support/DefaultHttpHeaderMapper.java b/spring-integration-http/src/main/java/org/springframework/integration/http/support/DefaultHttpHeaderMapper.java
index cf05e8c49c..021033b7aa 100644
--- a/spring-integration-http/src/main/java/org/springframework/integration/http/support/DefaultHttpHeaderMapper.java
+++ b/spring-integration-http/src/main/java/org/springframework/integration/http/support/DefaultHttpHeaderMapper.java
@@ -344,7 +344,9 @@ public class DefaultHttpHeaderMapper implements HeaderMapper<HttpHeaders>, BeanF
 	}
 	
 	public void afterPropertiesSet() throws Exception {
-		this.conversionService = IntegrationContextUtils.getConversionService(this.beanFactory);
+		if (this.beanFactory != null){
+			this.conversionService = IntegrationContextUtils.getConversionService(this.beanFactory);
+		}
 	}
 
 	private boolean containsElementIgnoreCase(String[] headerNames, String name){