diff --git a/src/docbkx/gateway.xml b/src/docbkx/gateway.xml
index 8483e2b4cf..ece10d5dea 100644
--- a/src/docbkx/gateway.xml
+++ b/src/docbkx/gateway.xml
@@ -98,6 +98,35 @@
 	In the above case you can clearly see how a different header value will be set for the 'RESPONSE_TYPE' 
 	header based on the gateway's method.
     </para>
+    <para>
+    As with anything else, Gateway invocation might result in error.
+    By default all error that have occurred downstream will be re-thrown as MessagingExeption (RuntimeException) 
+    upon Gateway's method invocation. However there are times when you may want to treat Exception as a valid reply, 
+    by mapping it to a Message. To accomplish this Gateway provides support for Exception mappers via <emphasis>exception-mapper</emphasis> 
+    attribute. 
+    </para>
+<programlisting language="xml"><![CDATA[<si:gateway id="sampleGateway"
+		default-request-channel="gatewayChannel" 
+		service-interface="foo.bar.SimpleGateway"
+		exception-mapper="exceptionMapper"/>
+				
+<bean id="exceptionMapper" class="foo.bar.SampleExceptionMapper"/>
+				
+				]]></programlisting>
+				
+	<emphasis>foo.bar.SampleExceptionMapper</emphasis> is the implementation of 
+	<emphasis>org.springframework.integration.message.InboundMessageMapper</emphasis> which only defines one method <code>toMessage(Object object)</code>.
+<programlisting language="java"><![CDATA[public static class SampleExceptionMapper implements InboundMessageMapper<Throwable>{
+	public Message<?> toMessage(Throwable object) throws Exception {
+		MessageHandlingException ex = (MessageHandlingException) object;		
+		return MessageBuilder.withPayload("Error happened in message: " + 
+		            ex.getFailedMessage().getPayload()).build();
+	}
+		
+}
+				]]></programlisting>	
+ 
+ 
   </section>
 
 </chapter>
\ No newline at end of file
diff --git a/src/docbkx/jms.xml b/src/docbkx/jms.xml
index 97fd8373e4..ce53db987e 100644
--- a/src/docbkx/jms.xml
+++ b/src/docbkx/jms.xml
@@ -146,6 +146,35 @@
       Integration Message <emphasis>payload</emphasis> will be converted into a JMS Message (e.g. String payload
       becomes a JMS TextMessage).
     </para>
+    <para>
+    As with anything else, Gateway invocation might result in error.
+    By default Producer will not be notified of the errors thta might have occurredon ythe consumer side and will time out waiting for 
+    the reply. However there might be times when you to communicate error condition back to the consumer, 
+    in other words treat the Exception as a valid reply valid reply by mapping it to a Message. To accomplish this 
+    JMS Inbound Gateway provides support for Exception mappers via <emphasis>exception-mapper</emphasis> 
+    attribute. 
+   
+    
+<programlisting language="xml"><![CDATA[<int-jms:inbound-gateway request-destination="requestQueue" 
+          request-channel="jmsinputchannel"
+          exception-mapper="errorMessageMapper"/>
+				
+<bean id="exceptionMapper" class="foo.bar.SampleExceptionMapper"/>
+				
+				]]></programlisting>
+				
+	<emphasis>foo.bar.SampleExceptionMapper</emphasis> is the implementation of 
+	<emphasis>org.springframework.integration.message.InboundMessageMapper</emphasis> which only defines one method <code>toMessage(Object object)</code>.
+<programlisting language="java"><![CDATA[public static class SampleExceptionMapper implements InboundMessageMapper<Throwable>{
+	public Message<?> toMessage(Throwable object) throws Exception {
+		MessageHandlingException ex = (MessageHandlingException) object;		
+		return MessageBuilder.withPayload("Error happened in message: " + 
+		            ex.getFailedMessage().getPayload()).build();
+	}
+		
+}
+				]]></programlisting>	
+    </para>
   </section>
 
   <section id="jms-outbound-gateway">