diff --git a/activemq-core/src/main/java/org/apache/activemq/store/amq/RecoveryListenerAdapter.java b/activemq-core/src/main/java/org/apache/activemq/store/amq/RecoveryListenerAdapter.java
index 7555a7a074..9d430fad3a 100644
--- a/activemq-core/src/main/java/org/apache/activemq/store/amq/RecoveryListenerAdapter.java
+++ b/activemq-core/src/main/java/org/apache/activemq/store/amq/RecoveryListenerAdapter.java
@@ -55,9 +55,8 @@ final class RecoveryListenerAdapter implements MessageRecoveryListener {
         if (message != null) {
             return recoverMessage(message);
         } else {
-            LOG.error("Message id " + ref + " could not be recovered from the data store - already dispatched");
+            throw new IllegalStateException("Message id " + ref + " could not be recovered from the data store - already dispatched");
         }
-        return false;
     }
 
     MessageId getLastRecoveredMessageId() {