diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/CachingConnectionFactory.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/CachingConnectionFactory.cs
index 3c42cfe6..6df52d50 100644
--- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/CachingConnectionFactory.cs
+++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/CachingConnectionFactory.cs
@@ -40,7 +40,7 @@ namespace Spring.Messaging.Nms.Connections
     /// SessionCacheSize property in case of a high-concurrency environment.
     /// </remarks>
     /// <author>Juergen Hoeller</author>
-    /// <author>Mark Pollack</author>
+    /// <author>Mark Pollack (.NET)</author>
     public class CachingConnectionFactory : SingleConnectionFactory
     {
         #region Logging Definition
diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/SingleConnectionFactory.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/SingleConnectionFactory.cs
index 773357d0..130de362 100644
--- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/SingleConnectionFactory.cs
+++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/SingleConnectionFactory.cs
@@ -275,15 +275,14 @@ namespace Spring.Messaging.Nms.Connections
             {
                 con.ClientId = ClientId;
             }
-            if (ExceptionListener != null || ReconnectOnException)
+            if (reconnectOnException)
             {
-                IExceptionListener listenerToUse = ExceptionListener;
-                if (ReconnectOnException)
-                {
-                    //add reconnect exception handler first.
-                    con.ExceptionListener += new ExceptionListener(this.OnException);
-                }
-                con.ExceptionListener += new ExceptionListener(listenerToUse.OnException);                              
+                //add reconnect exception handler first to exception chain.
+                con.ExceptionListener += new ExceptionListener(this.OnException);
+            }
+            if (ExceptionListener != null)
+            {
+                con.ExceptionListener += new ExceptionListener(ExceptionListener.OnException);                
             }
         }
 
diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/NmsTemplate.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/NmsTemplate.cs
index 87b4e3d3..458b0027 100644
--- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/NmsTemplate.cs
+++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/NmsTemplate.cs
@@ -898,7 +898,7 @@ namespace Spring.Messaging.Nms.Core
         {
             CheckMessageConverter();
             Send(destinationName, new ConvertAndSendMessageCreator(this, message, postProcessor));
-  
+
         }
 
         /// <summary> Receive a message synchronously from the default destination, but only
diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/SimpleMessageListenerContainer.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/SimpleMessageListenerContainer.cs
index 9a368a32..3feb135d 100644
--- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/SimpleMessageListenerContainer.cs
+++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/SimpleMessageListenerContainer.cs
@@ -192,7 +192,7 @@ namespace Spring.Messaging.Nms.Listener
         public void OnException(Exception exception)
         {
             // First invoke the user-specific ExceptionListener, if any.
-            //InvokeExceptionListener(exception);
+            InvokeExceptionListener(exception);
             // now try to recover the shared Connection and all consumers...
             if (logger.IsInfoEnabled)
             {
diff --git a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/CachingConnectionFactoryTests.cs b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/CachingConnectionFactoryTests.cs
index 56b87b1b..7a5c5da1 100644
--- a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/CachingConnectionFactoryTests.cs
+++ b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/CachingConnectionFactoryTests.cs
@@ -149,7 +149,7 @@ namespace Spring.Messaging.Nms.Connections
             IConnection connection = new TestConnection();
 
             Expect.Call(connectionFactory.CreateConnection()).Return(connection).Repeat.Once();
-
+            
             mocks.ReplayAll();
 
 
diff --git a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Integration/SimpleMessageListenerContainerTests.xml b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Integration/SimpleMessageListenerContainerTests.xml
index 8b0d49c3..cf8de992 100644
--- a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Integration/SimpleMessageListenerContainerTests.xml
+++ b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Integration/SimpleMessageListenerContainerTests.xml
@@ -23,7 +23,7 @@
   <object id="SimpleMessageListener" type="Spring.Messaging.Nms.Integration.SimpleMessageListener, Spring.Messaging.Nms.Tests"/>
 
 
-  <object name="NmsTemplate" type="Spring.Messaging.Nms.NmsTemplate, Spring.Messaging.Nms">
+  <object name="NmsTemplate" type="Spring.Messaging.Nms.Core.NmsTemplate, Spring.Messaging.Nms">
     <property name="ConnectionFactory" ref="ConnectionFactory"/>
     <property name="DefaultDestinationName" value="test.queue"/>
   </object>