diff --git a/internal/admin/handler.go b/internal/admin/handler.go
index ca46d50eee..abf47d18cc 100644
--- a/internal/admin/handler.go
+++ b/internal/admin/handler.go
@@ -951,6 +951,10 @@ func (h *Handler) PullMessageFromQueue(c *gin.Context) {
 		return
 	}
 	messages, err := msgQueueEngine.GetMessages(req.MessageCount)
+	if err != nil {
+		common.ErrorWithCode(c, common.CodeBadRequest, err.Error())
+		return
+	}
 	var result []map[string]string
 	if req.AckPolicy == "ACK" {
 		for _, message := range messages {
diff --git a/internal/service/memory_message_service.go b/internal/service/memory_message_service.go
index 2774b2d5d1..6863725c3b 100644
--- a/internal/service/memory_message_service.go
+++ b/internal/service/memory_message_service.go
@@ -377,7 +377,7 @@ func queueMemoryTask(ctx context.Context, memoryID, tenantID string, rawMessageI
 	if err != nil {
 		return fmt.Errorf("marshal memory task message: %w", err)
 	}
-	if err := mq.PublishTask(common.TaskSubject, tmPayload); err != nil {
+	if err = mq.PublishTask(common.TaskSubject, tmPayload); err != nil {
 		return fmt.Errorf("publish memory task %s: %w", taskID, err)
 	}
 	return nil