diff --git a/basic/testing-examples/readme.txt b/basic/testing-examples/readme.txt
index d942d5b6..6b0e6773 100644
--- a/basic/testing-examples/readme.txt
+++ b/basic/testing-examples/readme.txt
@@ -69,3 +69,9 @@ This test case shows how to verify that a <gateway/> has been configured
 to work as expected, including @Header parameters on the gateway method
 and <method/> elements in the configuration.
 
+
+...errorhandling.GatewayTests.java
+
+This test case shows how to verify that gateway error-channel configuration
+is correct, and show how to extract the cause and failed message from
+the MessagingException.
diff --git a/basic/testing-examples/src/main/resources/META-INF/spring/integration/08-errorhandling/integration-context.xml b/basic/testing-examples/src/main/resources/META-INF/spring/integration/08-errorhandling/integration-context.xml
new file mode 100644
index 00000000..b87711af
--- /dev/null
+++ b/basic/testing-examples/src/main/resources/META-INF/spring/integration/08-errorhandling/integration-context.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans:beans xmlns="http://www.springframework.org/schema/integration"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:beans="http://www.springframework.org/schema/beans"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
+			http://www.springframework.org/schema/beans/spring-beans.xsd
+			http://www.springframework.org/schema/integration
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
+
+	<gateway id="voidGateway" 
+		default-request-channel="inputChannel"
+		error-channel="errorChannel"
+		service-interface="org.springframework.integration.samples.testing.gateway.VoidGateway">
+	</gateway>
+	
+	<channel id="inputChannel"/>
+	
+	<channel id="errorChannel"/>
+	
+	
+</beans:beans>
diff --git a/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/errorhandling/GatewayTests-context.xml b/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/errorhandling/GatewayTests-context.xml
new file mode 100644
index 00000000..8d02afa2
--- /dev/null
+++ b/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/errorhandling/GatewayTests-context.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans:beans xmlns="http://www.springframework.org/schema/integration"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:beans="http://www.springframework.org/schema/beans"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
+			http://www.springframework.org/schema/beans/spring-beans.xsd
+			http://www.springframework.org/schema/integration
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
+
+	<beans:import resource="classpath:META-INF/spring/integration/08-errorhandling/integration-context.xml" />
+	
+	<!-- Cause a failure -->
+	<transformer input-channel="inputChannel" 
+		expression="1/0"/>
+		
+	<bridge input-channel="errorChannel"
+		output-channel="testChannel"/>
+		
+	<channel id="testChannel">
+		<queue/>
+	</channel>
+	
+</beans:beans>
\ No newline at end of file
diff --git a/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/errorhandling/GatewayTests.java b/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/errorhandling/GatewayTests.java
new file mode 100644
index 00000000..2a4fb081
--- /dev/null
+++ b/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/errorhandling/GatewayTests.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2002-2011 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.integration.samples.testing.errorhandling;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.integration.Message;
+import org.springframework.integration.MessageHandlingException;
+import org.springframework.integration.MessagingException;
+import org.springframework.integration.channel.QueueChannel;
+import org.springframework.integration.samples.testing.gateway.VoidGateway;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+
+/**
+ * 
+ * Shows how to test a gateway to ensure the message injected
+ * into the Spring Integration flow is what we expected.
+ * The gateway uses a direct input channel. The configuration would
+ * be a fragment of a larger flow. Since the input channel is direct,
+ * it has no subscribers outside the context of a larger flow. So, 
+ * in this test case, we bridge it to a {@link QueueChannel} to
+ * facilitate easy testing.
+ * 
+ * @author Gary Russell
+ * @since 2.0.2
+ *
+ */
+@ContextConfiguration	// default context name is <ClassName>-context.xml
+@RunWith(SpringJUnit4ClassRunner.class)
+public class GatewayTests {
+	
+	@Autowired
+	QueueChannel testChannel;
+	
+	@Autowired
+	VoidGateway gateway;
+	
+	@Test
+	public void testTrueHeader() {
+		String payload = "XXXABCXXX";
+		String fileName = "abc.txt";
+		gateway.process(payload, fileName);
+		Message<?> errorMessage = testChannel.receive(0);
+		assertNotNull("Expected an error message", errorMessage);
+		assertEquals(payload, ((MessagingException) errorMessage.getPayload()).getFailedMessage().getPayload());
+		Throwable cause = ((MessagingException) errorMessage.getPayload()).getCause();
+		assertTrue("Expected exception, got:" + cause, cause instanceof MessageHandlingException);
+	}
+}