diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/remote/AbstractRemoteFileStreamingMessageSource.java b/spring-integration-file/src/main/java/org/springframework/integration/file/remote/AbstractRemoteFileStreamingMessageSource.java
index e02f259bbd..2029397fc0 100644
--- a/spring-integration-file/src/main/java/org/springframework/integration/file/remote/AbstractRemoteFileStreamingMessageSource.java
+++ b/spring-integration-file/src/main/java/org/springframework/integration/file/remote/AbstractRemoteFileStreamingMessageSource.java
@@ -143,7 +143,7 @@ public abstract class AbstractRemoteFileStreamingMessageSource<F>
 						.build();
 			}
 			catch (IOException e) {
-				return new MessagingException("IOException when retrieving " + remotePath, e);
+				throw new MessagingException("IOException when retrieving " + remotePath, e);
 			}
 		}
 		return null;
diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/remote/StreamingInboundTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/remote/StreamingInboundTests.java
index fb1878835b..e90e864f87 100644
--- a/spring-integration-file/src/test/java/org/springframework/integration/file/remote/StreamingInboundTests.java
+++ b/spring-integration-file/src/test/java/org/springframework/integration/file/remote/StreamingInboundTests.java
@@ -20,18 +20,22 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.BDDMockito.willReturn;
+import static org.mockito.BDDMockito.willThrow;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
 import java.io.ByteArrayInputStream;
+import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Comparator;
 import java.util.List;
 
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.ExpectedException;
 
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.integration.IntegrationMessageHeaderAccessor;
@@ -43,6 +47,7 @@ import org.springframework.integration.file.remote.session.SessionFactory;
 import org.springframework.integration.file.splitter.FileSplitter;
 import org.springframework.integration.transformer.StreamTransformer;
 import org.springframework.messaging.Message;
+import org.springframework.messaging.MessagingException;
 
 /**
  * @author Gary Russell
@@ -51,6 +56,9 @@ import org.springframework.messaging.Message;
  */
 public class StreamingInboundTests {
 
+	@Rule
+	public ExpectedException exception = ExpectedException.none();
+
 	private final StreamTransformer transformer = new StreamTransformer();
 
 	@SuppressWarnings("unchecked")
@@ -109,6 +117,17 @@ public class StreamingInboundTests {
 		verify(sessionFactory.getSession(), times(2)).list("/foo");
 	}
 
+	@Test
+	public void testExceptionOnFetch() {
+		exception.expect(MessagingException.class);
+		StringSessionFactory sessionFactory = new StringSessionFactory();
+		Streamer streamer = new Streamer(new StringRemoteFileTemplate(sessionFactory), null);
+		streamer.setBeanFactory(mock(BeanFactory.class));
+		streamer.setRemoteDirectory("/bad");
+		streamer.afterPropertiesSet();
+		streamer.receive();
+	}
+
 	@SuppressWarnings("unchecked")
 	@Test
 	public void testLineByLine() throws Exception {
@@ -251,6 +270,9 @@ public class StreamingInboundTests {
 				willReturn(foo2).given(session).readRaw("/bar/foo");
 				willReturn(bar2).given(session).readRaw("/bar/bar");
 
+				willReturn(new String[] { "/bad/file" }).given(session).list("/bad");
+				willThrow(new IOException("No file")).given(session).readRaw("/bad/file");
+
 				given(session.finalizeRaw()).willReturn(true);
 
 				this.session = session;