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);
         }
     }