diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ErrorMessageExceptionTypeRouterParserTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ErrorMessageExceptionTypeRouterParserTests-context.xml
new file mode 100644
index 0000000000..e82fe86eec
--- /dev/null
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ErrorMessageExceptionTypeRouterParserTests-context.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:int="http://www.springframework.org/schema/integration"
+	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-2.0.xsd">
+
+
+	<int:exception-type-router input-channel="inputChannel" default-output-channel="defaultChannel">
+		<int:mapping exception-type="java.lang.IllegalArgumentException" channel="illegalChannel"/>
+		<int:mapping exception-type="java.lang.NullPointerException" channel="npeChannel"/>
+	</int:exception-type-router>
+	
+	<int:channel id="defaultChannel">
+		<int:queue/>
+	</int:channel>
+	
+	<int:channel id="illegalChannel">
+		<int:queue/>
+	</int:channel>
+
+	<int:channel id="npeChannel">
+		<int:queue/>
+	</int:channel>
+</beans>
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ErrorMessageExceptionTypeRouterParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ErrorMessageExceptionTypeRouterParserTests.java
new file mode 100644
index 0000000000..70e006a64d
--- /dev/null
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ErrorMessageExceptionTypeRouterParserTests.java
@@ -0,0 +1,62 @@
+/*
+ * 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.config.xml;
+
+import static junit.framework.Assert.assertTrue;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.integration.MessageChannel;
+import org.springframework.integration.channel.QueueChannel;
+import org.springframework.integration.message.ErrorMessage;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+/**
+ * @author Oleg Zhurakousky
+ *
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration
+public class ErrorMessageExceptionTypeRouterParserTests {
+	
+	@Autowired
+	private MessageChannel inputChannel;
+	
+	@Autowired
+	private QueueChannel defaultChannel;
+	
+	@Autowired
+	private QueueChannel illegalChannel;
+	
+	@Autowired
+	private QueueChannel npeChannel;
+
+	@Test
+	public void validateExceptionTypeRouterConfig(){
+		
+		inputChannel.send(new ErrorMessage(new NullPointerException()));
+		assertTrue(npeChannel.receive(1000).getPayload() instanceof NullPointerException);
+		
+		inputChannel.send(new ErrorMessage(new IllegalArgumentException()));
+		assertTrue(illegalChannel.receive(1000).getPayload()  instanceof IllegalArgumentException);
+		
+		inputChannel.send(new ErrorMessage(new RuntimeException()));
+		assertTrue(defaultChannel.receive(1000).getPayload()  instanceof RuntimeException);
+	}
+}