diff --git a/src/org/jgroups/protocols/TransferQueueBundler.java b/src/org/jgroups/protocols/TransferQueueBundler.java
index 604acacbc0..712e4e957f 100644
--- a/src/org/jgroups/protocols/TransferQueueBundler.java
+++ b/src/org/jgroups/protocols/TransferQueueBundler.java
@@ -81,7 +81,12 @@ public synchronized void stop() {
         if(tmp != null) {
             tmp.interrupt();
             if(tmp.isAlive()) {
-                try {tmp.join(500);} catch(InterruptedException e) {}
+                try {
+                    tmp.join(500);
+                }
+                catch(InterruptedException e) {
+                    Thread.currentThread().interrupt();
+                }
             }
         }
         drain();
@@ -129,6 +134,9 @@ public void run() {
                     sendBundledMessages();
                 }
             }
+            catch(InterruptedException iex) {
+                Thread.currentThread().interrupt();
+            }
             catch(Throwable t) {
                 log.trace("%s: failed sending message: %s", transport.addr(), t);
             }