diff --git a/core/src/main/java/org/springframework/ws/client/core/WebServiceTemplate.java b/core/src/main/java/org/springframework/ws/client/core/WebServiceTemplate.java
index 8ef0c6b5..2f28a897 100644
--- a/core/src/main/java/org/springframework/ws/client/core/WebServiceTemplate.java
+++ b/core/src/main/java/org/springframework/ws/client/core/WebServiceTemplate.java
@@ -458,16 +458,16 @@ public class WebServiceTemplate extends WebServiceAccessor implements WebService
      * @throws IOException in case of I/O errors
      */
     protected boolean hasError(WebServiceConnection connection, WebServiceMessage request) throws IOException {
-        if (!connection.hasError()) {
-            return false;
-        }
-        if (checkConnectionForFault && connection instanceof FaultAwareWebServiceConnection) {
-            FaultAwareWebServiceConnection faultConnection = (FaultAwareWebServiceConnection) connection;
-            return !(faultConnection.hasFault() && request instanceof FaultAwareWebServiceMessage);
-        }
-        else {
-            return checkConnectionForFault;
+        if (connection.hasError() && checkConnectionForFault) {
+            if (connection instanceof FaultAwareWebServiceConnection) {
+                FaultAwareWebServiceConnection faultConnection = (FaultAwareWebServiceConnection) connection;
+                return !(faultConnection.hasFault() && request instanceof FaultAwareWebServiceMessage);
+            }
+            else {
+                return true;
+            }
         }
+        return false;
     }
 
     /**