diff --git a/pkg/channels/whatsapp_native/whatsapp_native.go b/pkg/channels/whatsapp_native/whatsapp_native.go
index de4ecfd44..57b744f4e 100644
--- a/pkg/channels/whatsapp_native/whatsapp_native.go
+++ b/pkg/channels/whatsapp_native/whatsapp_native.go
@@ -269,9 +269,9 @@ func (c *WhatsAppNativeChannel) Stop(ctx context.Context) error {
 }
 
 func (c *WhatsAppNativeChannel) eventHandler(evt any) {
-	switch evt.(type) {
+	switch v := evt.(type) {
 	case *events.Message:
-		c.handleIncoming(evt.(*events.Message))
+		c.handleIncoming(v)
 	case *events.Disconnected:
 		logger.InfoCF("whatsapp", "WhatsApp disconnected, will attempt reconnection", nil)
 		c.reconnectMu.Lock()
diff --git a/pkg/config/config.go b/pkg/config/config.go
index b36014b9f..bb3b446d2 100644
--- a/pkg/config/config.go
+++ b/pkg/config/config.go
@@ -194,6 +194,9 @@ type ExposePath struct {
 // Uses strings.Replacer for O(n+m) performance (computed once per SecurityConfig).
 // Short content (below FilterMinLength) is returned unchanged for performance.
 func (c *Config) FilterSensitiveData(content string) string {
+	if c == nil {
+		return content
+	}
 	// Check if filtering is enabled (default: true)
 	if !c.Tools.IsFilterSensitiveDataEnabled() {
 		return content
diff --git a/pkg/seahorse/store.go b/pkg/seahorse/store.go
index 0a0d07044..342fd855b 100644
--- a/pkg/seahorse/store.go
+++ b/pkg/seahorse/store.go
@@ -56,7 +56,10 @@ func (s *Store) GetOrCreateConversation(ctx context.Context, sessionKey string)
 		}
 		return nil, fmt.Errorf("create conversation: %w", err)
 	}
-	id, _ := result.LastInsertId()
+	id, err := result.LastInsertId()
+	if err != nil {
+		return nil, fmt.Errorf("get last insert id: %w", err)
+	}
 	return &Conversation{
 		ConversationID: id,
 		SessionKey:     sessionKey,
@@ -193,7 +196,10 @@ func (s *Store) AddMessageWithReasoning(
 	if err != nil {
 		return nil, fmt.Errorf("add message: %w", err)
 	}
-	id, _ := result.LastInsertId()
+	id, err := result.LastInsertId()
+	if err != nil {
+		return nil, fmt.Errorf("get last insert id: %w", err)
+	}
 	return &Message{
 		ID:               id,
 		ConversationID:   convID,
@@ -282,7 +288,10 @@ func (s *Store) AddMessageWithPartsAndReasoning(
 	if err != nil {
 		return nil, fmt.Errorf("add message: %w", err)
 	}
-	msgID, _ := result.LastInsertId()
+	msgID, err := result.LastInsertId()
+	if err != nil {
+		return nil, fmt.Errorf("get last insert id: %w", err)
+	}
 
 	for i, p := range parts {
 		_, err = tx.ExecContext(