diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/AbstractJournalStorageManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/AbstractJournalStorageManager.java
index 33fc7197ab..44230b0f6d 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/AbstractJournalStorageManager.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/AbstractJournalStorageManager.java
@@ -46,6 +46,7 @@ import javax.transaction.xa.Xid;
 import io.netty.buffer.Unpooled;
 import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
 import org.apache.activemq.artemis.api.core.ActiveMQBuffers;
+import org.apache.activemq.artemis.api.core.ActiveMQShutdownException;
 import org.apache.activemq.artemis.api.core.Message;
 import org.apache.activemq.artemis.api.core.Pair;
 import org.apache.activemq.artemis.api.core.SimpleString;
@@ -1720,7 +1721,11 @@ public abstract class AbstractJournalStorageManager extends CriticalComponentImp
             try {
                confirmPendingLargeMessage(largeServerMessage.getPendingRecordID());
                largeServerMessage.clearPendingRecordID();
-            } catch (Exception e) {
+            } catch (ActiveMQShutdownException e) {
+               // this may happen, this is asynchronous as all that would happen is we missed the update
+               // since the update was missed, next restart this operation will be retried
+               ActiveMQServerLogger.LOGGER.debug(e.getMessage(), e);
+            } catch (Throwable e) {
                ActiveMQServerLogger.LOGGER.warn(e.getMessage(), e);
             }
          }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/BasicOpenWireTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/BasicOpenWireTest.java
index 982860fee4..34cc94bdeb 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/BasicOpenWireTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/BasicOpenWireTest.java
@@ -116,11 +116,9 @@ public class BasicOpenWireTest extends OpenWireTestBase {
          }
          testQueues.clear();
       } catch (Throwable e) {
-         System.out.println("Exception !! " + e);
          e.printStackTrace();
       } finally {
          super.tearDown();
-         System.out.println("Super done.");
       }
    }