diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/tail/OSDelegatingFileTailingMessageProducer.java b/spring-integration-file/src/main/java/org/springframework/integration/file/tail/OSDelegatingFileTailingMessageProducer.java
index 6ca5eadfb9..23997a550b 100644
--- a/spring-integration-file/src/main/java/org/springframework/integration/file/tail/OSDelegatingFileTailingMessageProducer.java
+++ b/spring-integration-file/src/main/java/org/springframework/integration/file/tail/OSDelegatingFileTailingMessageProducer.java
@@ -188,8 +188,8 @@ public class OSDelegatingFileTailingMessageProducer extends FileTailingMessagePr
 			}
 			return;
 		}
-		final BufferedReader errorReader = new BufferedReader(new InputStreamReader(process.getErrorStream()));
 		this.getTaskExecutor().execute(() -> {
+			BufferedReader errorReader = new BufferedReader(new InputStreamReader(process.getErrorStream()));
 			String statusMessage;
 			if (logger.isDebugEnabled()) {
 				logger.debug("Reading stderr");
diff --git a/spring-integration-test/src/main/java/org/springframework/integration/test/mail/TestMailServer.java b/spring-integration-test/src/main/java/org/springframework/integration/test/mail/TestMailServer.java
index dae82d7fc5..5b44b2c0d2 100644
--- a/spring-integration-test/src/main/java/org/springframework/integration/test/mail/TestMailServer.java
+++ b/spring-integration-test/src/main/java/org/springframework/integration/test/mail/TestMailServer.java
@@ -97,6 +97,9 @@ public class TestMailServer {
 					write("220 foo SMTP");
 					while (!socket.isClosed()) {
 						String line = reader.readLine();
+						if (line == null) {
+							break;
+						}
 						if (line.contains("EHLO")) {
 							write("250-foo hello [0,0,0,0], foo");
 							write("250-AUTH LOGIN PLAIN");