1 files changed, 5 insertions, 2 deletions
diff --git a/vespaclient-core/src/main/java/com/yahoo/feedapi/Feeder.java b/vespaclient-core/src/main/java/com/yahoo/feedapi/Feeder.java
index a1440a1ff32..e354cba141d 100644
--- a/vespaclient-core/src/main/java/com/yahoo/feedapi/Feeder.java
+++ b/vespaclient-core/src/main/java/com/yahoo/feedapi/Feeder.java
@@ -78,7 +78,7 @@ public abstract class Feeder {
             return errors;
         }
 
-        while (!sender.isAborted() && !sender.hasTimedOut()) {
+        while (!sender.isAborted()) {
             try {
                 VespaXMLFeedReader.Operation op = new VespaXMLFeedReader.Operation();
                 reader.read(op);
@@ -92,7 +92,10 @@ public abstract class Feeder {
                 } else {
                     sender.sendOperation(op);
                 }
-            } catch (XMLStreamException | NullPointerException e) {
+            } catch (XMLStreamException e) {
+                addException(e);
+                break;
+            } catch (NullPointerException e) {
                 addException(e);
                 break;
             } catch (Exception e) {