1 files changed, 2 insertions, 5 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 e354cba141d..a1440a1ff32 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()) {
+        while (!sender.isAborted() && !sender.hasTimedOut()) {
             try {
                 VespaXMLFeedReader.Operation op = new VespaXMLFeedReader.Operation();
                 reader.read(op);
@@ -92,10 +92,7 @@ public abstract class Feeder {
                 } else {
                     sender.sendOperation(op);
                 }
-            } catch (XMLStreamException e) {
-                addException(e);
-                break;
-            } catch (NullPointerException e) {
+            } catch (XMLStreamException | NullPointerException e) {
                 addException(e);
                 break;
             } catch (Exception e) {