diff --git a/waku/v2/node/storage/message/waku_message_store.nim b/waku/v2/node/storage/message/waku_message_store.nim
index 95a6f97af..7e25898eb 100644
--- a/waku/v2/node/storage/message/waku_message_store.nim
+++ b/waku/v2/node/storage/message/waku_message_store.nim
@@ -125,7 +125,7 @@ method getAll*(db: WakuMessageStore, onData: message_store.DataProc, limit = non
   
   let res = db.database.query(selectQuery, msg)
   if res.isErr:
-    return err("failed")
+    return err(res.error)
 
   ok gotMessages
 
diff --git a/waku/v2/protocol/waku_store/waku_store.nim b/waku/v2/protocol/waku_store/waku_store.nim
index da1160a31..7f5682b2f 100644
--- a/waku/v2/protocol/waku_store/waku_store.nim
+++ b/waku/v2/protocol/waku_store/waku_store.nim
@@ -459,8 +459,9 @@ proc init*(ws: WakuStore, capacity = DefaultStoreCapacity) =
   if res.isErr:
     warn "failed to load messages from store", err = res.error
     waku_store_errors.inc(labelValues = ["store_load_failure"])
+  else:
+    info "successfully loaded from store"
   
-  info "successfully loaded from store"
   debug "the number of messages in the memory", messageNum=ws.messages.len
   waku_store_messages.set(ws.messages.len.int64, labelValues = ["stored"])