diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/serializer/ByteArrayCrLfSerializer.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/serializer/ByteArrayCrLfSerializer.java
index 6258693272..cc16a10431 100644
--- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/serializer/ByteArrayCrLfSerializer.java
+++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/serializer/ByteArrayCrLfSerializer.java
@@ -53,7 +53,7 @@ public class ByteArrayCrLfSerializer extends AbstractPooledBufferByteArraySerial
 		int n = 0;
 		int bite;
 		if (logger.isDebugEnabled()) {
-			logger.debug("Available to read:" + inputStream.available());
+			logger.debug("Available to read: " + inputStream.available());
 		}
 		try {
 			while (true) {
@@ -67,8 +67,7 @@ public class ByteArrayCrLfSerializer extends AbstractPooledBufferByteArraySerial
 				}
 				buffer[n++] = (byte) bite;
 				if (n >= this.maxMessageSize) {
-					throw new IOException("CRLF not found before max message length: "
-							+ this.maxMessageSize);
+					throw new IOException("CRLF not found before max message length: " + this.maxMessageSize);
 				}
 			}
 			return n - 1; // trim \r
diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/TcpNioConnectionReadTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/TcpNioConnectionReadTests.java
index 2c4f61f5be..673eff62b1 100644
--- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/TcpNioConnectionReadTests.java
+++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/TcpNioConnectionReadTests.java
@@ -16,6 +16,7 @@
 
 package org.springframework.integration.ip.tcp.connection;
 
+import static org.hamcrest.Matchers.anyOf;
 import static org.hamcrest.Matchers.containsString;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThat;
@@ -431,7 +432,7 @@ public class TcpNioConnectionReadTests {
 		assertTrue(errorMessageLetch.await(10, TimeUnit.SECONDS));
 
 		assertThat(errorMessageRef.get().getMessage(),
-				containsString("Connection is closed"));
+				anyOf(containsString("Connection is closed"), containsString("Socket closed during message assembly")));
 
 		assertTrue(semaphore.tryAcquire(10000, TimeUnit.MILLISECONDS));
 		assertTrue(removed.size() > 0);