diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNioServerConnectionFactory.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNioServerConnectionFactory.java
index 405d3572b8..abb5ae4bfb 100644
--- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNioServerConnectionFactory.java
+++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNioServerConnectionFactory.java
@@ -151,6 +151,9 @@ public class TcpNioServerConnectionFactory extends AbstractServerConnectionFacto
 						Socket socket = channel.socket();
 						setSocketAttributes(socket);
 						TcpNioConnection connection = createTcpNioConnection(channel);
+						if (connection == null) {
+							continue;
+						}
 						connection.setTaskExecutor(this.taskExecutor);
 						connection.setLastRead(now);
 						connections.put(channel, connection);