diff --git a/core/src/main/java/org/springframework/ws/server/EndpointInterceptor.java b/core/src/main/java/org/springframework/ws/server/EndpointInterceptor.java
index 136e0481..c6f197c1 100644
--- a/core/src/main/java/org/springframework/ws/server/EndpointInterceptor.java
+++ b/core/src/main/java/org/springframework/ws/server/EndpointInterceptor.java
@@ -23,13 +23,14 @@ import org.springframework.ws.context.MessageContext;
  * existing or custom interceptors for certain groups of endpoints, to add common preprocessing behavior without needing
  * to modify each endpoint implementation.
  * <p/>
- * A <code>EndpointInterceptor</code> gets called before the appropriate {@link EndpointAdapter} triggers the invocation
- * of the endpoint itself. This mechanism can be used for a large field of preprocessing aspects, e.g. for authorization
- * checks, or message header checks. Its main purpose is to allow for factoring out repetitive endpoint code.
+ * An <code>EndpointInterceptor</code> gets called before the appropriate {@link EndpointAdapter} triggers the
+ * invocation of the endpoint itself. This mechanism can be used for a large field of preprocessing aspects, e.g. for
+ * authorization checks, or message header checks. Its main purpose is to allow for factoring out repetitive endpoint
+ * code.
  * <p/>
  * Typically an interceptor chain is defined per {@link EndpointMapping} bean, sharing its granularity. To be able to
  * apply a certain interceptor chain to a group of handlers, one needs to map the desired handlers via one
- * <code>EndpointMapping</code> bean.The interceptors themselves are defined as beans in the application context,
+ * <code>EndpointMapping</code> bean. The interceptors themselves are defined as beans in the application context,
  * referenced by the mapping bean definition via its <code>interceptors</code> property (in XML: a &lt;list&gt; of
  * &lt;ref&gt;).
  *
@@ -54,7 +55,7 @@ public interface EndpointInterceptor {
      * @return <code>true</code> to continue processing of the request interceptor chain; <code>false</code> to indicate
      *         blocking of the request endpoint chain, <em>without invoking the endpoint</em>
      * @throws Exception in case of errors
-     * @see org.springframework.ws.context.MessageContext#getRequest()
+     * @see MessageContext#getRequest()
      */
     boolean handleRequest(MessageContext messageContext, Object endpoint) throws Exception;
 
@@ -73,9 +74,9 @@ public interface EndpointInterceptor {
      * @return <code>true</code> to continue processing of the reponse interceptor chain; <code>false</code> to indicate
      *         blocking of the response endpoint chain.
      * @throws Exception in case of errors
-     * @see org.springframework.ws.context.MessageContext#getRequest()
-     * @see org.springframework.ws.context.MessageContext#hasResponse()
-     * @see org.springframework.ws.context.MessageContext#getResponse()
+     * @see MessageContext#getRequest()
+     * @see MessageContext#hasResponse()
+     * @see MessageContext#getResponse()
      */
     boolean handleResponse(MessageContext messageContext, Object endpoint) throws Exception;
 
diff --git a/core/src/main/java/org/springframework/ws/server/MessageDispatcher.java b/core/src/main/java/org/springframework/ws/server/MessageDispatcher.java
index 2ea475dc..175e3738 100644
--- a/core/src/main/java/org/springframework/ws/server/MessageDispatcher.java
+++ b/core/src/main/java/org/springframework/ws/server/MessageDispatcher.java
@@ -23,6 +23,9 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanFactoryUtils;
 import org.springframework.beans.factory.BeanNameAware;
@@ -48,9 +51,6 @@ import org.springframework.ws.soap.server.SoapMessageDispatcher;
 import org.springframework.ws.support.DefaultStrategiesHelper;
 import org.springframework.ws.transport.WebServiceMessageReceiver;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
 /**
  * Central dispatcher for use within Spring-WS, dispatching Web service messages to registered endpoints.
  * <p/>
@@ -211,7 +211,7 @@ public class MessageDispatcher implements WebServiceMessageReceiver, BeanNameAwa
                     }
                 }
             }
-            // Acutally invoke the endpoint
+            // Actually invoke the endpoint
             EndpointAdapter endpointAdapter = getEndpointAdapter(mappedEndpoint.getEndpoint());
             endpointAdapter.invoke(messageContext, mappedEndpoint.getEndpoint());
 
@@ -324,6 +324,7 @@ public class MessageDispatcher implements WebServiceMessageReceiver, BeanNameAwa
      * @param interceptorIndex index of last interceptor that was called
      * @param messageContext   the message context, whose request and response are filled
      * @see EndpointInterceptor#handleResponse(MessageContext,Object)
+     * @see EndpointInterceptor#handleFault(MessageContext, Object)
      */
     private void triggerHandleResponse(EndpointInvocationChain mappedEndpoint,
                                        int interceptorIndex,