diff --git a/activemq-core/src/main/java/org/apache/activemq/ActiveMQQueueBrowser.java b/activemq-core/src/main/java/org/apache/activemq/ActiveMQQueueBrowser.java
index d2d0f7719d..fa3c7e44ac 100755
--- a/activemq-core/src/main/java/org/apache/activemq/ActiveMQQueueBrowser.java
+++ b/activemq-core/src/main/java/org/apache/activemq/ActiveMQQueueBrowser.java
@@ -229,10 +229,12 @@ public class ActiveMQQueueBrowser implements
      */
     protected void waitForMessage() {
         try {
-            synchronized (semaphore ) {
+            synchronized (semaphore) {
                 semaphore.wait(2000);
             }
-        } catch (InterruptedException e) {
+        }
+        catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
         }
     }
     
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/tcp/ResponseHolder.java b/activemq-core/src/main/java/org/apache/activemq/transport/tcp/ResponseHolder.java
index 6f1d1ca417..77869f23ff 100755
--- a/activemq-core/src/main/java/org/apache/activemq/transport/tcp/ResponseHolder.java
+++ b/activemq-core/src/main/java/org/apache/activemq/transport/tcp/ResponseHolder.java
@@ -69,7 +69,7 @@ public class ResponseHolder {
                     lock.wait(timeout);
                 }
                 catch (InterruptedException e) {
-                    e.printStackTrace();
+                    Thread.currentThread().interrupt();
                 }
             }
         }