diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerService.java b/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerService.java
index e51d5214804..97433bd378d 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerService.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerService.java
@@ -788,7 +788,7 @@ private void preDestroy () {
         try {
             stop();
         } catch (Exception ex) {
-            throw new RuntimeException();
+            throw new RuntimeException("Exception during broker preDestroy cleanup: " + getBrokerName(), ex);
         }
     }
 
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/QueueZeroPrefetchLazyDispatchPriorityTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/QueueZeroPrefetchLazyDispatchPriorityTest.java
index dd4dd8e356f..5d43d07f6b0 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/QueueZeroPrefetchLazyDispatchPriorityTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/QueueZeroPrefetchLazyDispatchPriorityTest.java
@@ -203,6 +203,10 @@ public void testPriorityMessagesWithJmsBrowser() throws Exception {
             final ArrayList<Message> consumeList = consumeMessages("TestQ");
             LOG.info("Consumed list {}", consumeList.size());
 
+            // wait until remaining messages are actually consumed
+            assertTrue("Remaining messages consumed",
+                    Wait.waitFor(() -> consumeList.size() == numToSend - 1, 5000, 100));
+
             // compare lists
             // assertEquals("Iteration: " + i
             // +", message 1 should be priority high", 5,