diff --git a/internal/store/pg/knowledge_graph_temporal.go b/internal/store/pg/knowledge_graph_temporal.go
index 0fb8a96c..020cab98 100644
--- a/internal/store/pg/knowledge_graph_temporal.go
+++ b/internal/store/pg/knowledge_graph_temporal.go
@@ -68,7 +68,10 @@ func (s *PGKnowledgeGraphStore) ListEntitiesTemporal(ctx context.Context, agentI
 
 // SupersedeEntity atomically expires the old entity and inserts a replacement.
 func (s *PGKnowledgeGraphStore) SupersedeEntity(ctx context.Context, old *store.Entity, replacement *store.Entity) error {
-	aid := mustParseUUID(old.AgentID)
+	aid, err := parseUUID(old.AgentID)
+	if err != nil {
+		return fmt.Errorf("kg supersede entity: %w", err)
+	}
 	tx, err := s.db.BeginTx(ctx, nil)
 	if err != nil {
 		return fmt.Errorf("supersede begin tx: %w", err)
diff --git a/internal/store/pg/knowledge_graph_traversal.go b/internal/store/pg/knowledge_graph_traversal.go
index c1d86900..2a1ea079 100644
--- a/internal/store/pg/knowledge_graph_traversal.go
+++ b/internal/store/pg/knowledge_graph_traversal.go
@@ -15,8 +15,14 @@ func (s *PGKnowledgeGraphStore) Traverse(ctx context.Context, agentID, userID, s
 		maxDepth = 3
 	}
 
-	aid := mustParseUUID(agentID)
-	startID := mustParseUUID(startEntityID)
+	aid, err := parseUUID(agentID)
+	if err != nil {
+		return nil, fmt.Errorf("kg traverse: agent: %w", err)
+	}
+	startID, err := parseUUID(startEntityID)
+	if err != nil {
+		return nil, fmt.Errorf("kg traverse: start: %w", err)
+	}
 
 	tx, err := s.db.BeginTx(ctx, nil)
 	if err != nil {
diff --git a/internal/store/pg/memory_admin.go b/internal/store/pg/memory_admin.go
index db0beba1..79796654 100644
--- a/internal/store/pg/memory_admin.go
+++ b/internal/store/pg/memory_admin.go
@@ -2,6 +2,7 @@ package pg
 
 import (
 	"context"
+	"fmt"
 
 	"github.com/nextlevelbuilder/goclaw/internal/store"
 )
@@ -35,7 +36,10 @@ func (s *PGMemoryStore) ListAllDocumentsGlobal(ctx context.Context) ([]store.Doc
 
 // ListAllDocuments returns all documents for an agent across all users (global + personal).
 func (s *PGMemoryStore) ListAllDocuments(ctx context.Context, agentID string) ([]store.DocumentInfo, error) {
-	aid := mustParseUUID(agentID)
+	aid, err := parseUUID(agentID)
+	if err != nil {
+		return nil, fmt.Errorf("memory list all documents: %w", err)
+	}
 	tc, tcArgs, _, err := scopeClause(ctx, 2)
 	if err != nil {
 		return nil, err
@@ -57,7 +61,10 @@ func (s *PGMemoryStore) ListAllDocuments(ctx context.Context, agentID string) ([
 
 // GetDocumentDetail returns full document info with chunk and embedding counts.
 func (s *PGMemoryStore) GetDocumentDetail(ctx context.Context, agentID, userID, path string) (*store.DocumentDetail, error) {
-	aid := mustParseUUID(agentID)
+	aid, err := parseUUID(agentID)
+	if err != nil {
+		return nil, fmt.Errorf("memory get document detail: %w", err)
+	}
 
 	var q string
 	var args []any
@@ -99,7 +106,10 @@ func (s *PGMemoryStore) GetDocumentDetail(ctx context.Context, agentID, userID,
 
 // ListChunks returns chunks for a document identified by agent, user, and path.
 func (s *PGMemoryStore) ListChunks(ctx context.Context, agentID, userID, path string) ([]store.ChunkInfo, error) {
-	aid := mustParseUUID(agentID)
+	aid, err := parseUUID(agentID)
+	if err != nil {
+		return nil, fmt.Errorf("memory list chunks: %w", err)
+	}
 
 	var q string
 	var args []any
diff --git a/internal/store/pg/memory_search.go b/internal/store/pg/memory_search.go
index 4c593e13..0b92d646 100644
--- a/internal/store/pg/memory_search.go
+++ b/internal/store/pg/memory_search.go
@@ -16,7 +16,10 @@ func (s *PGMemoryStore) Search(ctx context.Context, query string, agentID, userI
 		maxResults = s.cfg.MaxResults
 	}
 
-	aid := mustParseUUID(agentID)
+	aid, err := parseUUID(agentID)
+	if err != nil {
+		return nil, fmt.Errorf("memory search: %w", err)
+	}
 
 	// FTS search using tsvector
 	ftsResults, err := s.ftsSearch(ctx, query, aid, userID, maxResults*2)
diff --git a/internal/store/pg/vault_documents_enrichment.go b/internal/store/pg/vault_documents_enrichment.go
index 5d7d9307..3aa2fc83 100644
--- a/internal/store/pg/vault_documents_enrichment.go
+++ b/internal/store/pg/vault_documents_enrichment.go
@@ -10,12 +10,18 @@ import (
 
 // UpdateSummaryAndReembed updates the document summary and re-embeds the combined text.
 func (s *PGVaultStore) UpdateSummaryAndReembed(ctx context.Context, tenantID, docID, summary string) error {
-	tid := mustParseUUID(tenantID)
-	did := mustParseUUID(docID)
+	tid, err := parseUUID(tenantID)
+	if err != nil {
+		return fmt.Errorf("vault update summary: tenant: %w", err)
+	}
+	did, err := parseUUID(docID)
+	if err != nil {
+		return fmt.Errorf("vault update summary: doc: %w", err)
+	}
 
 	// Fetch title+path to build embed text.
 	var title, path string
-	err := s.db.QueryRowContext(ctx,
+	err = s.db.QueryRowContext(ctx,
 		`SELECT title, path FROM vault_documents WHERE id = $1 AND tenant_id = $2`,
 		did, tid,
 	).Scan(&title, &path)