diff --git a/pkg/coredata/access_entry.go b/pkg/coredata/access_entry.go
index 732401309..4739638e4 100644
--- a/pkg/coredata/access_entry.go
+++ b/pkg/coredata/access_entry.go
@@ -89,10 +89,11 @@ func (e *AccessEntry) AuthorizationAttributes(
 	defer rows.Close()
 
 	attrsByID := make(policy.AttributesByID)
+
 	for rows.Next() {
 		var id, organizationID gid.GID
-		err := rows.Scan(&id, &organizationID)
-		if err != nil {
+
+		if err := rows.Scan(&id, &organizationID); err != nil {
 			return nil, fmt.Errorf("cannot scan authorization attributes: %w", err)
 		}
 
diff --git a/pkg/coredata/access_entry_decision_history.go b/pkg/coredata/access_entry_decision_history.go
index 97f88b796..0debeb4ca 100644
--- a/pkg/coredata/access_entry_decision_history.go
+++ b/pkg/coredata/access_entry_decision_history.go
@@ -108,10 +108,11 @@ func (h *AccessEntryDecisionHistory) AuthorizationAttributes(
 	defer rows.Close()
 
 	attrsByID := make(policy.AttributesByID)
+
 	for rows.Next() {
 		var id, organizationID gid.GID
-		err := rows.Scan(&id, &organizationID)
-		if err != nil {
+
+		if err := rows.Scan(&id, &organizationID); err != nil {
 			return nil, fmt.Errorf("cannot scan authorization attributes: %w", err)
 		}
 
diff --git a/pkg/coredata/access_review_campaign.go b/pkg/coredata/access_review_campaign.go
index d22f150ea..471e9ed24 100644
--- a/pkg/coredata/access_review_campaign.go
+++ b/pkg/coredata/access_review_campaign.go
@@ -73,10 +73,11 @@ func (c *AccessReviewCampaign) AuthorizationAttributes(
 	defer rows.Close()
 
 	attrsByID := make(policy.AttributesByID)
+
 	for rows.Next() {
 		var id, organizationID gid.GID
-		err := rows.Scan(&id, &organizationID)
-		if err != nil {
+
+		if err := rows.Scan(&id, &organizationID); err != nil {
 			return nil, fmt.Errorf("cannot scan authorization attributes: %w", err)
 		}
 
diff --git a/pkg/coredata/access_source.go b/pkg/coredata/access_source.go
index a0971c8ee..b4ab6779a 100644
--- a/pkg/coredata/access_source.go
+++ b/pkg/coredata/access_source.go
@@ -72,10 +72,11 @@ func (as *AccessSource) AuthorizationAttributes(
 	defer rows.Close()
 
 	attrsByID := make(policy.AttributesByID)
+
 	for rows.Next() {
 		var id, organizationID gid.GID
-		err := rows.Scan(&id, &organizationID)
-		if err != nil {
+
+		if err := rows.Scan(&id, &organizationID); err != nil {
 			return nil, fmt.Errorf("cannot scan authorization attributes: %w", err)
 		}
 
diff --git a/pkg/coredata/agent_run.go b/pkg/coredata/agent_run.go
index bf52771d3..763b758d5 100644
--- a/pkg/coredata/agent_run.go
+++ b/pkg/coredata/agent_run.go
@@ -141,10 +141,11 @@ func (e *AgentRun) AuthorizationAttributes(
 	defer rows.Close()
 
 	attrsByID := make(policy.AttributesByID)
+
 	for rows.Next() {
 		var id, organizationID gid.GID
-		err := rows.Scan(&id, &organizationID)
-		if err != nil {
+
+		if err := rows.Scan(&id, &organizationID); err != nil {
 			return nil, fmt.Errorf("cannot scan authorization attributes: %w", err)
 		}
 
diff --git a/pkg/coredata/applicability_statement.go b/pkg/coredata/applicability_statement.go
index 96e518737..b1e9d31bd 100644
--- a/pkg/coredata/applicability_statement.go
+++ b/pkg/coredata/applicability_statement.go
@@ -77,10 +77,11 @@ func (s *ApplicabilityStatement) AuthorizationAttributes(
 	defer rows.Close()
 
 	attrsByID := make(policy.AttributesByID)
+
 	for rows.Next() {
 		var id, organizationID gid.GID
-		err := rows.Scan(&id, &organizationID)
-		if err != nil {
+
+		if err := rows.Scan(&id, &organizationID); err != nil {
 			return nil, fmt.Errorf("cannot scan authorization attributes: %w", err)
 		}
 
diff --git a/pkg/coredata/asset.go b/pkg/coredata/asset.go
index 732270dc0..ccae4f0bb 100644
--- a/pkg/coredata/asset.go
+++ b/pkg/coredata/asset.go
@@ -75,10 +75,11 @@ func (a *Asset) AuthorizationAttributes(
 	defer rows.Close()
 
 	attrsByID := make(policy.AttributesByID)
+
 	for rows.Next() {
 		var id, organizationID gid.GID
-		err := rows.Scan(&id, &organizationID)
-		if err != nil {
+
+		if err := rows.Scan(&id, &organizationID); err != nil {
 			return nil, fmt.Errorf("cannot scan authorization attributes: %w", err)
 		}
 
diff --git a/pkg/coredata/audit.go b/pkg/coredata/audit.go
index a2fc6ed55..1ede4c2c3 100644
--- a/pkg/coredata/audit.go
+++ b/pkg/coredata/audit.go
@@ -81,10 +81,11 @@ func (a *Audit) AuthorizationAttributes(
 	defer rows.Close()
 
 	attrsByID := make(policy.AttributesByID)
+
 	for rows.Next() {
 		var id, organizationID gid.GID
-		err := rows.Scan(&id, &organizationID)
-		if err != nil {
+
+		if err := rows.Scan(&id, &organizationID); err != nil {
 			return nil, fmt.Errorf("cannot scan authorization attributes: %w", err)
 		}
 
diff --git a/pkg/coredata/audit_log_entry.go b/pkg/coredata/audit_log_entry.go
index 480d89e66..914ef4a21 100644
--- a/pkg/coredata/audit_log_entry.go
+++ b/pkg/coredata/audit_log_entry.go
@@ -73,10 +73,11 @@ func (e *AuditLogEntry) AuthorizationAttributes(
 	defer rows.Close()
 
 	attrsByID := make(policy.AttributesByID)
+
 	for rows.Next() {
 		var id, organizationID gid.GID
-		err := rows.Scan(&id, &organizationID)
-		if err != nil {
+
+		if err := rows.Scan(&id, &organizationID); err != nil {
 			return nil, fmt.Errorf("cannot scan authorization attributes: %w", err)
 		}
 
diff --git a/pkg/coredata/compliance_external_url.go b/pkg/coredata/compliance_external_url.go
index f9005a9e8..5978ed097 100644
--- a/pkg/coredata/compliance_external_url.go
+++ b/pkg/coredata/compliance_external_url.go
@@ -73,10 +73,11 @@ func (c *ComplianceExternalURL) AuthorizationAttributes(
 	defer rows.Close()
 
 	attrsByID := make(policy.AttributesByID)
+
 	for rows.Next() {
 		var id, organizationID gid.GID
-		err := rows.Scan(&id, &organizationID)
-		if err != nil {
+
+		if err := rows.Scan(&id, &organizationID); err != nil {
 			return nil, fmt.Errorf("cannot scan authorization attributes: %w", err)
 		}
 
diff --git a/pkg/coredata/compliance_framework.go b/pkg/coredata/compliance_framework.go
index c8c339df6..e1f2a5e11 100644
--- a/pkg/coredata/compliance_framework.go
+++ b/pkg/coredata/compliance_framework.go
@@ -76,10 +76,11 @@ func (c *ComplianceFramework) AuthorizationAttributes(
 	defer rows.Close()
 
 	attrsByID := make(policy.AttributesByID)
+
 	for rows.Next() {
 		var id, organizationID gid.GID
-		err := rows.Scan(&id, &organizationID)
-		if err != nil {
+
+		if err := rows.Scan(&id, &organizationID); err != nil {
 			return nil, fmt.Errorf("cannot scan authorization attributes: %w", err)
 		}
 
diff --git a/pkg/coredata/connector.go b/pkg/coredata/connector.go
index 164522138..98a2599e0 100644
--- a/pkg/coredata/connector.go
+++ b/pkg/coredata/connector.go
@@ -105,10 +105,11 @@ func (c *Connector) AuthorizationAttributes(
 	defer rows.Close()
 
 	attrsByID := make(policy.AttributesByID)
+
 	for rows.Next() {
 		var id, organizationID gid.GID
-		err := rows.Scan(&id, &organizationID)
-		if err != nil {
+
+		if err := rows.Scan(&id, &organizationID); err != nil {
 			return nil, fmt.Errorf("cannot scan authorization attributes: %w", err)
 		}
 
diff --git a/pkg/coredata/control.go b/pkg/coredata/control.go
index ccca097dc..c159c994e 100644
--- a/pkg/coredata/control.go
+++ b/pkg/coredata/control.go
@@ -78,10 +78,11 @@ func (c *Control) AuthorizationAttributes(
 	defer rows.Close()
 
 	attrsByID := make(policy.AttributesByID)
+
 	for rows.Next() {
 		var id, organizationID gid.GID
-		err := rows.Scan(&id, &organizationID)
-		if err != nil {
+
+		if err := rows.Scan(&id, &organizationID); err != nil {
 			return nil, fmt.Errorf("cannot scan authorization attributes: %w", err)
 		}
 
diff --git a/pkg/coredata/cookie_banner.go b/pkg/coredata/cookie_banner.go
index 193ec8ff2..be47357b8 100644
--- a/pkg/coredata/cookie_banner.go
+++ b/pkg/coredata/cookie_banner.go
@@ -77,10 +77,11 @@ func (b *CookieBanner) AuthorizationAttributes(
 	defer rows.Close()
 
 	attrsByID := make(policy.AttributesByID)
+
 	for rows.Next() {
 		var id, organizationID gid.GID
-		err := rows.Scan(&id, &organizationID)
-		if err != nil {
+
+		if err := rows.Scan(&id, &organizationID); err != nil {
 			return nil, fmt.Errorf("cannot scan authorization attributes: %w", err)
 		}
 
diff --git a/pkg/coredata/cookie_banner_translation.go b/pkg/coredata/cookie_banner_translation.go
index c43aaee5a..c30e7390b 100644
--- a/pkg/coredata/cookie_banner_translation.go
+++ b/pkg/coredata/cookie_banner_translation.go
@@ -62,10 +62,11 @@ func (t *CookieBannerTranslation) AuthorizationAttributes(
 	defer rows.Close()
 
 	attrsByID := make(policy.AttributesByID)
+
 	for rows.Next() {
 		var id, organizationID gid.GID
-		err := rows.Scan(&id, &organizationID)
-		if err != nil {
+
+		if err := rows.Scan(&id, &organizationID); err != nil {
 			return nil, fmt.Errorf("cannot scan authorization attributes: %w", err)
 		}
 
diff --git a/pkg/coredata/cookie_banner_version.go b/pkg/coredata/cookie_banner_version.go
index 86d6a7460..2ad26cea1 100644
--- a/pkg/coredata/cookie_banner_version.go
+++ b/pkg/coredata/cookie_banner_version.go
@@ -100,10 +100,11 @@ func (v *CookieBannerVersion) AuthorizationAttributes(
 	defer rows.Close()
 
 	attrsByID := make(policy.AttributesByID)
+
 	for rows.Next() {
 		var id, organizationID gid.GID
-		err := rows.Scan(&id, &organizationID)
-		if err != nil {
+
+		if err := rows.Scan(&id, &organizationID); err != nil {
 			return nil, fmt.Errorf("cannot scan authorization attributes: %w", err)
 		}
 
diff --git a/pkg/coredata/cookie_category.go b/pkg/coredata/cookie_category.go
index e63c4502f..c272d9fcc 100644
--- a/pkg/coredata/cookie_category.go
+++ b/pkg/coredata/cookie_category.go
@@ -102,10 +102,11 @@ func (c *CookieCategory) AuthorizationAttributes(
 	defer rows.Close()
 
 	attrsByID := make(policy.AttributesByID)
+
 	for rows.Next() {
 		var id, organizationID gid.GID
-		err := rows.Scan(&id, &organizationID)
-		if err != nil {
+
+		if err := rows.Scan(&id, &organizationID); err != nil {
 			return nil, fmt.Errorf("cannot scan authorization attributes: %w", err)
 		}
 
diff --git a/pkg/coredata/cookie_consent_record.go b/pkg/coredata/cookie_consent_record.go
index 2f40b5742..a80059c37 100644
--- a/pkg/coredata/cookie_consent_record.go
+++ b/pkg/coredata/cookie_consent_record.go
@@ -78,10 +78,11 @@ func (r *CookieConsentRecord) AuthorizationAttributes(
 	defer rows.Close()
 
 	attrsByID := make(policy.AttributesByID)
+
 	for rows.Next() {
 		var id, organizationID gid.GID
-		err := rows.Scan(&id, &organizationID)
-		if err != nil {
+
+		if err := rows.Scan(&id, &organizationID); err != nil {
 			return nil, fmt.Errorf("cannot scan authorization attributes: %w", err)
 		}
 
diff --git a/pkg/coredata/custom_domain.go b/pkg/coredata/custom_domain.go
index 8db662d26..eab13b143 100644
--- a/pkg/coredata/custom_domain.go
+++ b/pkg/coredata/custom_domain.go
@@ -88,10 +88,11 @@ func (cd *CustomDomain) AuthorizationAttributes(
 	defer rows.Close()
 
 	attrsByID := make(policy.AttributesByID)
+
 	for rows.Next() {
 		var id, organizationID gid.GID
-		err := rows.Scan(&id, &organizationID)
-		if err != nil {
+
+		if err := rows.Scan(&id, &organizationID); err != nil {
 			return nil, fmt.Errorf("cannot scan authorization attributes: %w", err)
 		}
 
diff --git a/pkg/coredata/data_protection_impact_assessment.go b/pkg/coredata/data_protection_impact_assessment.go
index 7c40ac92f..289e7f131 100644
--- a/pkg/coredata/data_protection_impact_assessment.go
+++ b/pkg/coredata/data_protection_impact_assessment.go
@@ -183,10 +183,11 @@ func (dpia *DataProtectionImpactAssessment) AuthorizationAttributes(
 	defer rows.Close()
 
 	attrsByID := make(policy.AttributesByID)
+
 	for rows.Next() {
 		var id, organizationID gid.GID
-		err := rows.Scan(&id, &organizationID)
-		if err != nil {
+
+		if err := rows.Scan(&id, &organizationID); err != nil {
 			return nil, fmt.Errorf("cannot scan authorization attributes: %w", err)
 		}
 
diff --git a/pkg/coredata/datum.go b/pkg/coredata/datum.go
index 8bdb80dbb..36a080dd7 100644
--- a/pkg/coredata/datum.go
+++ b/pkg/coredata/datum.go
@@ -75,10 +75,11 @@ func (d *Datum) AuthorizationAttributes(
 	defer rows.Close()
 
 	attrsByID := make(policy.AttributesByID)
+
 	for rows.Next() {
 		var id, organizationID gid.GID
-		err := rows.Scan(&id, &organizationID)
-		if err != nil {
+
+		if err := rows.Scan(&id, &organizationID); err != nil {
 			return nil, fmt.Errorf("cannot scan authorization attributes: %w", err)
 		}
 
diff --git a/pkg/coredata/document.go b/pkg/coredata/document.go
index e3194cc6f..585e4c7da 100644
--- a/pkg/coredata/document.go
+++ b/pkg/coredata/document.go
@@ -85,10 +85,11 @@ func (d *Document) AuthorizationAttributes(
 	defer rows.Close()
 
 	attrsByID := make(policy.AttributesByID)
+
 	for rows.Next() {
 		var id, organizationID gid.GID
-		err := rows.Scan(&id, &organizationID)
-		if err != nil {
+
+		if err := rows.Scan(&id, &organizationID); err != nil {
 			return nil, fmt.Errorf("cannot scan authorization attributes: %w", err)
 		}
 
diff --git a/pkg/coredata/document_version.go b/pkg/coredata/document_version.go
index ca085d188..a2dbc56d5 100644
--- a/pkg/coredata/document_version.go
+++ b/pkg/coredata/document_version.go
@@ -73,10 +73,11 @@ func (dv *DocumentVersion) AuthorizationAttributes(
 	defer rows.Close()
 
 	attrsByID := make(policy.AttributesByID)
+
 	for rows.Next() {
 		var id, organizationID gid.GID
-		err := rows.Scan(&id, &organizationID)
-		if err != nil {
+
+		if err := rows.Scan(&id, &organizationID); err != nil {
 			return nil, fmt.Errorf("cannot scan authorization attributes: %w", err)
 		}
 
diff --git a/pkg/coredata/document_version_approval_decision.go b/pkg/coredata/document_version_approval_decision.go
index 3797fa945..54c4231c4 100644
--- a/pkg/coredata/document_version_approval_decision.go
+++ b/pkg/coredata/document_version_approval_decision.go
@@ -74,10 +74,11 @@ func (d *DocumentVersionApprovalDecision) AuthorizationAttributes(
 	defer rows.Close()
 
 	attrsByID := make(policy.AttributesByID)
+
 	for rows.Next() {
 		var id, organizationID gid.GID
-		err := rows.Scan(&id, &organizationID)
-		if err != nil {
+
+		if err := rows.Scan(&id, &organizationID); err != nil {
 			return nil, fmt.Errorf("cannot scan authorization attributes: %w", err)
 		}
 
diff --git a/pkg/coredata/document_version_approval_quorum.go b/pkg/coredata/document_version_approval_quorum.go
index c579568e4..2273e3963 100644
--- a/pkg/coredata/document_version_approval_quorum.go
+++ b/pkg/coredata/document_version_approval_quorum.go
@@ -70,10 +70,11 @@ func (q *DocumentVersionApprovalQuorum) AuthorizationAttributes(
 	defer rows.Close()
 
 	attrsByID := make(policy.AttributesByID)
+
 	for rows.Next() {
 		var id, organizationID gid.GID
-		err := rows.Scan(&id, &organizationID)
-		if err != nil {
+
+		if err := rows.Scan(&id, &organizationID); err != nil {
 			return nil, fmt.Errorf("cannot scan authorization attributes: %w", err)
 		}
 
diff --git a/pkg/coredata/document_version_signature.go b/pkg/coredata/document_version_signature.go
index ea117717a..0b32d4c68 100644
--- a/pkg/coredata/document_version_signature.go
+++ b/pkg/coredata/document_version_signature.go
@@ -84,10 +84,11 @@ func (dvs *DocumentVersionSignature) AuthorizationAttributes(
 	defer rows.Close()
 
 	attrsByID := make(policy.AttributesByID)
+
 	for rows.Next() {
 		var id, organizationID gid.GID
-		err := rows.Scan(&id, &organizationID)
-		if err != nil {
+
+		if err := rows.Scan(&id, &organizationID); err != nil {
 			return nil, fmt.Errorf("cannot scan authorization attributes: %w", err)
 		}
 
diff --git a/pkg/coredata/electronic_signature.go b/pkg/coredata/electronic_signature.go
index fce6364f2..fd3d6477c 100644
--- a/pkg/coredata/electronic_signature.go
+++ b/pkg/coredata/electronic_signature.go
@@ -78,6 +78,7 @@ func (es *ElectronicSignature) AuthorizationAttributes(
 	defer rows.Close()
 
 	attrsByID := make(policy.AttributesByID)
+
 	for rows.Next() {
 		var id, organizationID gid.GID
 		if err := rows.Scan(&id, &organizationID); err != nil {
diff --git a/pkg/coredata/email.go b/pkg/coredata/email.go
index 333e56c05..82be3cc02 100644
--- a/pkg/coredata/email.go
+++ b/pkg/coredata/email.go
@@ -91,10 +91,11 @@ WHERE
 	defer rows.Close()
 
 	attrsByID := make(policy.AttributesByID, len(resourceIDs))
+
 	for rows.Next() {
 		var id gid.GID
-		err = rows.Scan(&id)
-		if err != nil {
+
+		if err := rows.Scan(&id); err != nil {
 			return nil, fmt.Errorf("cannot scan email authorization attributes: %w", err)
 		}
 
diff --git a/pkg/coredata/evidence.go b/pkg/coredata/evidence.go
index 26b30e340..47a44ac54 100644
--- a/pkg/coredata/evidence.go
+++ b/pkg/coredata/evidence.go
@@ -79,10 +79,11 @@ func (e *Evidence) AuthorizationAttributes(
 	defer rows.Close()
 
 	attrsByID := make(policy.AttributesByID)
+
 	for rows.Next() {
 		var id, organizationID gid.GID
-		err := rows.Scan(&id, &organizationID)
-		if err != nil {
+
+		if err := rows.Scan(&id, &organizationID); err != nil {
 			return nil, fmt.Errorf("cannot scan authorization attributes: %w", err)
 		}
 
diff --git a/pkg/coredata/export_job.go b/pkg/coredata/export_job.go
index 8f288c7e5..3cc4cb54e 100644
--- a/pkg/coredata/export_job.go
+++ b/pkg/coredata/export_job.go
@@ -83,10 +83,11 @@ func (ej *ExportJob) AuthorizationAttributes(
 	defer rows.Close()
 
 	attrsByID := make(policy.AttributesByID)
+
 	for rows.Next() {
 		var id, organizationID gid.GID
-		err := rows.Scan(&id, &organizationID)
-		if err != nil {
+
+		if err := rows.Scan(&id, &organizationID); err != nil {
 			return nil, fmt.Errorf("cannot scan authorization attributes: %w", err)
 		}
 
diff --git a/pkg/coredata/file.go b/pkg/coredata/file.go
index 2a3e13d60..842c2897d 100644
--- a/pkg/coredata/file.go
+++ b/pkg/coredata/file.go
@@ -85,10 +85,11 @@ func (f *File) AuthorizationAttributes(
 	defer rows.Close()
 
 	attrsByID := make(policy.AttributesByID)
+
 	for rows.Next() {
 		var id, organizationID gid.GID
-		err := rows.Scan(&id, &organizationID)
-		if err != nil {
+
+		if err := rows.Scan(&id, &organizationID); err != nil {
 			return nil, fmt.Errorf("cannot scan authorization attributes: %w", err)
 		}
 
diff --git a/pkg/coredata/finding.go b/pkg/coredata/finding.go
index 86c626a0a..da259d7b7 100644
--- a/pkg/coredata/finding.go
+++ b/pkg/coredata/finding.go
@@ -92,10 +92,11 @@ func (f *Finding) AuthorizationAttributes(
 	defer rows.Close()
 
 	attrsByID := make(policy.AttributesByID)
+
 	for rows.Next() {
 		var id, organizationID gid.GID
-		err := rows.Scan(&id, &organizationID)
-		if err != nil {
+
+		if err := rows.Scan(&id, &organizationID); err != nil {
 			return nil, fmt.Errorf("cannot scan authorization attributes: %w", err)
 		}
 
diff --git a/pkg/coredata/framework.go b/pkg/coredata/framework.go
index 7751a5056..33a4047e1 100644
--- a/pkg/coredata/framework.go
+++ b/pkg/coredata/framework.go
@@ -80,6 +80,7 @@ WHERE
 	defer rows.Close()
 
 	attrsByID := make(policy.AttributesByID)
+
 	for rows.Next() {
 		var (
 			frameworkID    gid.GID
@@ -88,10 +89,12 @@ WHERE
 		if err := rows.Scan(&frameworkID, &organizationID); err != nil {
 			return nil, fmt.Errorf("cannot scan framework authorization attributes batch: %w", err)
 		}
+
 		attrsByID[frameworkID] = policy.Attributes{
 			"organization_id": organizationID.String(),
 		}
 	}
+
 	if err := rows.Err(); err != nil {
 		return nil, fmt.Errorf("cannot iterate framework authorization attributes batch: %w", err)
 	}
diff --git a/pkg/coredata/identity.go b/pkg/coredata/identity.go
index c374c2978..6e5fac1f0 100644
--- a/pkg/coredata/identity.go
+++ b/pkg/coredata/identity.go
@@ -170,6 +170,7 @@ WHERE
 	defer rows.Close()
 
 	attrsByID := make(policy.AttributesByID, len(resourceIDs))
+
 	for rows.Next() {
 		var (
 			id           gid.GID
diff --git a/pkg/coredata/invitation.go b/pkg/coredata/invitation.go
index a1652567e..c1597a26b 100644
--- a/pkg/coredata/invitation.go
+++ b/pkg/coredata/invitation.go
@@ -170,6 +170,7 @@ WHERE
 	defer rows.Close()
 
 	attrsByID := make(policy.AttributesByID, len(resourceIDs))
+
 	for rows.Next() {
 		var (
 			id             gid.GID
diff --git a/pkg/coredata/mailing_list.go b/pkg/coredata/mailing_list.go
index bafaba41d..222424217 100644
--- a/pkg/coredata/mailing_list.go
+++ b/pkg/coredata/mailing_list.go
@@ -55,10 +55,11 @@ func (ml *MailingList) AuthorizationAttributes(
 	defer rows.Close()
 
 	attrsByID := make(policy.AttributesByID)
+
 	for rows.Next() {
 		var id, organizationID gid.GID
-		err := rows.Scan(&id, &organizationID)
-		if err != nil {
+
+		if err := rows.Scan(&id, &organizationID); err != nil {
 			return nil, fmt.Errorf("cannot scan authorization attributes: %w", err)
 		}
 
diff --git a/pkg/coredata/mailing_list_subscriber.go b/pkg/coredata/mailing_list_subscriber.go
index 294b60714..4d0c73f9f 100644
--- a/pkg/coredata/mailing_list_subscriber.go
+++ b/pkg/coredata/mailing_list_subscriber.go
@@ -64,10 +64,11 @@ func (cns *MailingListSubscriber) AuthorizationAttributes(
 	defer rows.Close()
 
 	attrsByID := make(policy.AttributesByID)
+
 	for rows.Next() {
 		var id, organizationID gid.GID
-		err := rows.Scan(&id, &organizationID)
-		if err != nil {
+
+		if err := rows.Scan(&id, &organizationID); err != nil {
 			return nil, fmt.Errorf("cannot scan authorization attributes: %w", err)
 		}
 
diff --git a/pkg/coredata/mailing_list_update.go b/pkg/coredata/mailing_list_update.go
index 98357e043..67307ac95 100644
--- a/pkg/coredata/mailing_list_update.go
+++ b/pkg/coredata/mailing_list_update.go
@@ -73,10 +73,11 @@ func (mlu *MailingListUpdate) AuthorizationAttributes(
 	defer rows.Close()
 
 	attrsByID := make(policy.AttributesByID)
+
 	for rows.Next() {
 		var id, organizationID gid.GID
-		err := rows.Scan(&id, &organizationID)
-		if err != nil {
+
+		if err := rows.Scan(&id, &organizationID); err != nil {
 			return nil, fmt.Errorf("cannot scan authorization attributes: %w", err)
 		}
 
diff --git a/pkg/coredata/measure.go b/pkg/coredata/measure.go
index 4eb898b69..f7b86026d 100644
--- a/pkg/coredata/measure.go
+++ b/pkg/coredata/measure.go
@@ -76,10 +76,11 @@ func (m *Measure) AuthorizationAttributes(
 	defer rows.Close()
 
 	attrsByID := make(policy.AttributesByID)
+
 	for rows.Next() {
 		var id, organizationID gid.GID
-		err := rows.Scan(&id, &organizationID)
-		if err != nil {
+
+		if err := rows.Scan(&id, &organizationID); err != nil {
 			return nil, fmt.Errorf("cannot scan authorization attributes: %w", err)
 		}
 
diff --git a/pkg/coredata/membership.go b/pkg/coredata/membership.go
index d31efb75a..4b8c67b42 100644
--- a/pkg/coredata/membership.go
+++ b/pkg/coredata/membership.go
@@ -228,6 +228,7 @@ WHERE
 	defer rows.Close()
 
 	attrsByID := make(policy.AttributesByID, len(resourceIDs))
+
 	for rows.Next() {
 		var (
 			id             gid.GID
diff --git a/pkg/coredata/membership_profile.go b/pkg/coredata/membership_profile.go
index a265af95a..56891965d 100644
--- a/pkg/coredata/membership_profile.go
+++ b/pkg/coredata/membership_profile.go
@@ -115,6 +115,7 @@ WHERE
 	defer rows.Close()
 
 	attrsByID := make(policy.AttributesByID, len(resourceIDs))
+
 	for rows.Next() {
 		var (
 			id             gid.GID
diff --git a/pkg/coredata/oauth2_client.go b/pkg/coredata/oauth2_client.go
index 42cbbb37c..277a64cfb 100644
--- a/pkg/coredata/oauth2_client.go
+++ b/pkg/coredata/oauth2_client.go
@@ -99,6 +99,7 @@ WHERE
 	defer rows.Close()
 
 	attrsByID := make(policy.AttributesByID, len(resourceIDs))
+
 	for rows.Next() {
 		var (
 			id             gid.GID
@@ -114,6 +115,7 @@ WHERE
 		if organizationID != nil {
 			attrs["organization_id"] = organizationID.String()
 		}
+
 		attrsByID[id] = attrs
 	}
 
diff --git a/pkg/coredata/oauth2_consent.go b/pkg/coredata/oauth2_consent.go
index 5eef9d87e..f232bedab 100644
--- a/pkg/coredata/oauth2_consent.go
+++ b/pkg/coredata/oauth2_consent.go
@@ -86,6 +86,7 @@ WHERE
 	defer rows.Close()
 
 	attrsByID := make(policy.AttributesByID, len(resourceIDs))
+
 	for rows.Next() {
 		var (
 			id         gid.GID
diff --git a/pkg/coredata/obligation.go b/pkg/coredata/obligation.go
index b5522dc63..1f4fe7791 100644
--- a/pkg/coredata/obligation.go
+++ b/pkg/coredata/obligation.go
@@ -83,10 +83,11 @@ func (o *Obligation) AuthorizationAttributes(
 	defer rows.Close()
 
 	attrsByID := make(policy.AttributesByID)
+
 	for rows.Next() {
 		var id, organizationID gid.GID
-		err := rows.Scan(&id, &organizationID)
-		if err != nil {
+
+		if err := rows.Scan(&id, &organizationID); err != nil {
 			return nil, fmt.Errorf("cannot scan authorization attributes: %w", err)
 		}
 
diff --git a/pkg/coredata/organization.go b/pkg/coredata/organization.go
index 144764e4d..e593396da 100644
--- a/pkg/coredata/organization.go
+++ b/pkg/coredata/organization.go
@@ -66,6 +66,7 @@ func (o *Organization) AuthorizationAttributes(
 	defer rows.Close()
 
 	attrsByID := make(policy.AttributesByID)
+
 	for rows.Next() {
 		var id gid.GID
 		if err := rows.Scan(&id); err != nil {
diff --git a/pkg/coredata/personal_api_key.go b/pkg/coredata/personal_api_key.go
index e3100b38e..123f6bd0f 100644
--- a/pkg/coredata/personal_api_key.go
+++ b/pkg/coredata/personal_api_key.go
@@ -120,6 +120,7 @@ WHERE
 	defer rows.Close()
 
 	attrsByID := make(policy.AttributesByID, len(resourceIDs))
+
 	for rows.Next() {
 		var (
 			id         gid.GID
diff --git a/pkg/coredata/processing_activities.go b/pkg/coredata/processing_activities.go
index 8d7de3775..4b72b31f0 100644
--- a/pkg/coredata/processing_activities.go
+++ b/pkg/coredata/processing_activities.go
@@ -196,10 +196,11 @@ func (p *ProcessingActivity) AuthorizationAttributes(
 	defer rows.Close()
 
 	attrsByID := make(policy.AttributesByID)
+
 	for rows.Next() {
 		var id, organizationID gid.GID
-		err := rows.Scan(&id, &organizationID)
-		if err != nil {
+
+		if err := rows.Scan(&id, &organizationID); err != nil {
 			return nil, fmt.Errorf("cannot scan authorization attributes: %w", err)
 		}
 
diff --git a/pkg/coredata/report.go b/pkg/coredata/report.go
index 87db4e0c7..4a4430d25 100644
--- a/pkg/coredata/report.go
+++ b/pkg/coredata/report.go
@@ -62,10 +62,11 @@ func (r *Report) AuthorizationAttributes(
 	defer rows.Close()
 
 	attrsByID := make(policy.AttributesByID)
+
 	for rows.Next() {
 		var id, organizationID gid.GID
-		err := rows.Scan(&id, &organizationID)
-		if err != nil {
+
+		if err := rows.Scan(&id, &organizationID); err != nil {
 			return nil, fmt.Errorf("cannot scan authorization attributes: %w", err)
 		}
 
diff --git a/pkg/coredata/rights_requests.go b/pkg/coredata/rights_requests.go
index c06aeb4a6..956bec06a 100644
--- a/pkg/coredata/rights_requests.go
+++ b/pkg/coredata/rights_requests.go
@@ -81,10 +81,11 @@ func (rr *RightsRequest) AuthorizationAttributes(
 	defer rows.Close()
 
 	attrsByID := make(policy.AttributesByID)
+
 	for rows.Next() {
 		var id, organizationID gid.GID
-		err := rows.Scan(&id, &organizationID)
-		if err != nil {
+
+		if err := rows.Scan(&id, &organizationID); err != nil {
 			return nil, fmt.Errorf("cannot scan authorization attributes: %w", err)
 		}
 
diff --git a/pkg/coredata/risk.go b/pkg/coredata/risk.go
index 18a062365..59b2450f9 100644
--- a/pkg/coredata/risk.go
+++ b/pkg/coredata/risk.go
@@ -202,10 +202,11 @@ func (r *Risk) AuthorizationAttributes(
 	defer rows.Close()
 
 	attrsByID := make(policy.AttributesByID)
+
 	for rows.Next() {
 		var id, organizationID gid.GID
-		err := rows.Scan(&id, &organizationID)
-		if err != nil {
+
+		if err := rows.Scan(&id, &organizationID); err != nil {
 			return nil, fmt.Errorf("cannot scan authorization attributes: %w", err)
 		}
 
diff --git a/pkg/coredata/risk_assessment.go b/pkg/coredata/risk_assessment.go
index cf2700608..b7ac981b3 100644
--- a/pkg/coredata/risk_assessment.go
+++ b/pkg/coredata/risk_assessment.go
@@ -71,10 +71,11 @@ func (ra *RiskAssessment) AuthorizationAttributes(
 	defer rows.Close()
 
 	attrsByID := make(policy.AttributesByID)
+
 	for rows.Next() {
 		var id, organizationID gid.GID
-		err := rows.Scan(&id, &organizationID)
-		if err != nil {
+
+		if err := rows.Scan(&id, &organizationID); err != nil {
 			return nil, fmt.Errorf("cannot scan authorization attributes: %w", err)
 		}
 
diff --git a/pkg/coredata/risk_assessment_node.go b/pkg/coredata/risk_assessment_node.go
index 085131ce6..433db6ca4 100644
--- a/pkg/coredata/risk_assessment_node.go
+++ b/pkg/coredata/risk_assessment_node.go
@@ -73,10 +73,11 @@ func (n *RiskAssessmentNode) AuthorizationAttributes(
 	defer rows.Close()
 
 	attrsByID := make(policy.AttributesByID)
+
 	for rows.Next() {
 		var id, organizationID gid.GID
-		err := rows.Scan(&id, &organizationID)
-		if err != nil {
+
+		if err := rows.Scan(&id, &organizationID); err != nil {
 			return nil, fmt.Errorf("cannot scan authorization attributes: %w", err)
 		}
 
diff --git a/pkg/coredata/risk_assessment_process.go b/pkg/coredata/risk_assessment_process.go
index 56bddbe91..1da24c472 100644
--- a/pkg/coredata/risk_assessment_process.go
+++ b/pkg/coredata/risk_assessment_process.go
@@ -74,10 +74,11 @@ func (p *RiskAssessmentProcess) AuthorizationAttributes(
 	defer rows.Close()
 
 	attrsByID := make(policy.AttributesByID)
+
 	for rows.Next() {
 		var id, organizationID gid.GID
-		err := rows.Scan(&id, &organizationID)
-		if err != nil {
+
+		if err := rows.Scan(&id, &organizationID); err != nil {
 			return nil, fmt.Errorf("cannot scan authorization attributes: %w", err)
 		}
 
diff --git a/pkg/coredata/risk_assessment_scenario.go b/pkg/coredata/risk_assessment_scenario.go
index 748f29035..1e4b343b2 100644
--- a/pkg/coredata/risk_assessment_scenario.go
+++ b/pkg/coredata/risk_assessment_scenario.go
@@ -72,10 +72,11 @@ func (s *RiskAssessmentScenario) AuthorizationAttributes(
 	defer rows.Close()
 
 	attrsByID := make(policy.AttributesByID)
+
 	for rows.Next() {
 		var id, organizationID gid.GID
-		err := rows.Scan(&id, &organizationID)
-		if err != nil {
+
+		if err := rows.Scan(&id, &organizationID); err != nil {
 			return nil, fmt.Errorf("cannot scan authorization attributes: %w", err)
 		}
 
diff --git a/pkg/coredata/risk_assessment_scope.go b/pkg/coredata/risk_assessment_scope.go
index 36a264a44..d3204c54f 100644
--- a/pkg/coredata/risk_assessment_scope.go
+++ b/pkg/coredata/risk_assessment_scope.go
@@ -71,10 +71,11 @@ func (s *RiskAssessmentScope) AuthorizationAttributes(
 	defer rows.Close()
 
 	attrsByID := make(policy.AttributesByID)
+
 	for rows.Next() {
 		var id, organizationID gid.GID
-		err := rows.Scan(&id, &organizationID)
-		if err != nil {
+
+		if err := rows.Scan(&id, &organizationID); err != nil {
 			return nil, fmt.Errorf("cannot scan authorization attributes: %w", err)
 		}
 
diff --git a/pkg/coredata/risk_assessment_threat.go b/pkg/coredata/risk_assessment_threat.go
index 49fe9b9e1..7e0f60d25 100644
--- a/pkg/coredata/risk_assessment_threat.go
+++ b/pkg/coredata/risk_assessment_threat.go
@@ -74,10 +74,11 @@ func (t *RiskAssessmentThreat) AuthorizationAttributes(
 	defer rows.Close()
 
 	attrsByID := make(policy.AttributesByID)
+
 	for rows.Next() {
 		var id, organizationID gid.GID
-		err := rows.Scan(&id, &organizationID)
-		if err != nil {
+
+		if err := rows.Scan(&id, &organizationID); err != nil {
 			return nil, fmt.Errorf("cannot scan authorization attributes: %w", err)
 		}
 
diff --git a/pkg/coredata/saml_configuration.go b/pkg/coredata/saml_configuration.go
index dca51aea3..e8ce99c9e 100644
--- a/pkg/coredata/saml_configuration.go
+++ b/pkg/coredata/saml_configuration.go
@@ -83,10 +83,11 @@ func (s *SAMLConfiguration) AuthorizationAttributes(
 	defer rows.Close()
 
 	attrsByID := make(policy.AttributesByID)
+
 	for rows.Next() {
 		var id, organizationID gid.GID
-		err := rows.Scan(&id, &organizationID)
-		if err != nil {
+
+		if err := rows.Scan(&id, &organizationID); err != nil {
 			return nil, fmt.Errorf("cannot scan authorization attributes: %w", err)
 		}
 
diff --git a/pkg/coredata/scim_bridge.go b/pkg/coredata/scim_bridge.go
index 29f0ecf6b..efefeec10 100644
--- a/pkg/coredata/scim_bridge.go
+++ b/pkg/coredata/scim_bridge.go
@@ -80,10 +80,11 @@ func (s *SCIMBridge) AuthorizationAttributes(
 	defer rows.Close()
 
 	attrsByID := make(policy.AttributesByID)
+
 	for rows.Next() {
 		var id, organizationID gid.GID
-		err := rows.Scan(&id, &organizationID)
-		if err != nil {
+
+		if err := rows.Scan(&id, &organizationID); err != nil {
 			return nil, fmt.Errorf("cannot scan authorization attributes: %w", err)
 		}
 
diff --git a/pkg/coredata/scim_configuration.go b/pkg/coredata/scim_configuration.go
index b4334f026..e98e29b18 100644
--- a/pkg/coredata/scim_configuration.go
+++ b/pkg/coredata/scim_configuration.go
@@ -70,10 +70,11 @@ func (s *SCIMConfiguration) AuthorizationAttributes(
 	defer rows.Close()
 
 	attrsByID := make(policy.AttributesByID)
+
 	for rows.Next() {
 		var id, organizationID gid.GID
-		err := rows.Scan(&id, &organizationID)
-		if err != nil {
+
+		if err := rows.Scan(&id, &organizationID); err != nil {
 			return nil, fmt.Errorf("cannot scan authorization attributes: %w", err)
 		}
 
diff --git a/pkg/coredata/scim_event.go b/pkg/coredata/scim_event.go
index fce195d8e..fa0de2e6b 100644
--- a/pkg/coredata/scim_event.go
+++ b/pkg/coredata/scim_event.go
@@ -76,10 +76,11 @@ func (s *SCIMEvent) AuthorizationAttributes(
 	defer rows.Close()
 
 	attrsByID := make(policy.AttributesByID)
+
 	for rows.Next() {
 		var id, organizationID gid.GID
-		err := rows.Scan(&id, &organizationID)
-		if err != nil {
+
+		if err := rows.Scan(&id, &organizationID); err != nil {
 			return nil, fmt.Errorf("cannot scan authorization attributes: %w", err)
 		}
 
diff --git a/pkg/coredata/session.go b/pkg/coredata/session.go
index e5cca61c2..6e0625703 100644
--- a/pkg/coredata/session.go
+++ b/pkg/coredata/session.go
@@ -221,6 +221,7 @@ WHERE
 	defer rows.Close()
 
 	attrsByID := make(policy.AttributesByID, len(resourceIDs))
+
 	for rows.Next() {
 		var (
 			id         gid.GID
diff --git a/pkg/coredata/slack_message.go b/pkg/coredata/slack_message.go
index 9a09b74c5..6239d0022 100644
--- a/pkg/coredata/slack_message.go
+++ b/pkg/coredata/slack_message.go
@@ -77,10 +77,11 @@ func (sm *SlackMessage) AuthorizationAttributes(
 	defer rows.Close()
 
 	attrsByID := make(policy.AttributesByID)
+
 	for rows.Next() {
 		var id, organizationID gid.GID
-		err := rows.Scan(&id, &organizationID)
-		if err != nil {
+
+		if err := rows.Scan(&id, &organizationID); err != nil {
 			return nil, fmt.Errorf("cannot scan authorization attributes: %w", err)
 		}
 
diff --git a/pkg/coredata/statement_of_applicability.go b/pkg/coredata/statement_of_applicability.go
index 188e0bcdc..c61e109d0 100644
--- a/pkg/coredata/statement_of_applicability.go
+++ b/pkg/coredata/statement_of_applicability.go
@@ -72,10 +72,11 @@ func (s *StatementOfApplicability) AuthorizationAttributes(
 	defer rows.Close()
 
 	attrsByID := make(policy.AttributesByID)
+
 	for rows.Next() {
 		var id, organizationID gid.GID
-		err := rows.Scan(&id, &organizationID)
-		if err != nil {
+
+		if err := rows.Scan(&id, &organizationID); err != nil {
 			return nil, fmt.Errorf("cannot scan authorization attributes: %w", err)
 		}
 
diff --git a/pkg/coredata/task.go b/pkg/coredata/task.go
index 485ea40cd..33cea7261 100644
--- a/pkg/coredata/task.go
+++ b/pkg/coredata/task.go
@@ -83,10 +83,11 @@ func (t *Task) AuthorizationAttributes(
 	defer rows.Close()
 
 	attrsByID := make(policy.AttributesByID)
+
 	for rows.Next() {
 		var id, organizationID gid.GID
-		err := rows.Scan(&id, &organizationID)
-		if err != nil {
+
+		if err := rows.Scan(&id, &organizationID); err != nil {
 			return nil, fmt.Errorf("cannot scan authorization attributes: %w", err)
 		}
 
diff --git a/pkg/coredata/third_party.go b/pkg/coredata/third_party.go
index 40b832ba1..81dc53bb4 100644
--- a/pkg/coredata/third_party.go
+++ b/pkg/coredata/third_party.go
@@ -201,10 +201,11 @@ func (v *ThirdParty) AuthorizationAttributes(
 	defer rows.Close()
 
 	attrsByID := make(policy.AttributesByID)
+
 	for rows.Next() {
 		var id, organizationID gid.GID
-		err := rows.Scan(&id, &organizationID)
-		if err != nil {
+
+		if err := rows.Scan(&id, &organizationID); err != nil {
 			return nil, fmt.Errorf("cannot scan authorization attributes: %w", err)
 		}
 
diff --git a/pkg/coredata/third_party_business_associate_agreement.go b/pkg/coredata/third_party_business_associate_agreement.go
index db2d23e64..a7d1b506b 100644
--- a/pkg/coredata/third_party_business_associate_agreement.go
+++ b/pkg/coredata/third_party_business_associate_agreement.go
@@ -72,10 +72,11 @@ func (vbaa *ThirdPartyBusinessAssociateAgreement) AuthorizationAttributes(
 	defer rows.Close()
 
 	attrsByID := make(policy.AttributesByID)
+
 	for rows.Next() {
 		var id, organizationID gid.GID
-		err := rows.Scan(&id, &organizationID)
-		if err != nil {
+
+		if err := rows.Scan(&id, &organizationID); err != nil {
 			return nil, fmt.Errorf("cannot scan authorization attributes: %w", err)
 		}
 
diff --git a/pkg/coredata/third_party_compliance_report.go b/pkg/coredata/third_party_compliance_report.go
index 28e81df8c..e451d4bb7 100644
--- a/pkg/coredata/third_party_compliance_report.go
+++ b/pkg/coredata/third_party_compliance_report.go
@@ -73,10 +73,11 @@ func (v *ThirdPartyComplianceReport) AuthorizationAttributes(
 	defer rows.Close()
 
 	attrsByID := make(policy.AttributesByID)
+
 	for rows.Next() {
 		var id, organizationID gid.GID
-		err := rows.Scan(&id, &organizationID)
-		if err != nil {
+
+		if err := rows.Scan(&id, &organizationID); err != nil {
 			return nil, fmt.Errorf("cannot scan authorization attributes: %w", err)
 		}
 
diff --git a/pkg/coredata/third_party_contact.go b/pkg/coredata/third_party_contact.go
index 6770b3a7c..3db5f40f9 100644
--- a/pkg/coredata/third_party_contact.go
+++ b/pkg/coredata/third_party_contact.go
@@ -77,10 +77,11 @@ func (vc *ThirdPartyContact) AuthorizationAttributes(
 	defer rows.Close()
 
 	attrsByID := make(policy.AttributesByID)
+
 	for rows.Next() {
 		var id, organizationID gid.GID
-		err := rows.Scan(&id, &organizationID)
-		if err != nil {
+
+		if err := rows.Scan(&id, &organizationID); err != nil {
 			return nil, fmt.Errorf("cannot scan authorization attributes: %w", err)
 		}
 
diff --git a/pkg/coredata/third_party_data_privacy_agreement.go b/pkg/coredata/third_party_data_privacy_agreement.go
index 149946758..77495cf75 100644
--- a/pkg/coredata/third_party_data_privacy_agreement.go
+++ b/pkg/coredata/third_party_data_privacy_agreement.go
@@ -72,10 +72,11 @@ func (vdpa *ThirdPartyDataPrivacyAgreement) AuthorizationAttributes(
 	defer rows.Close()
 
 	attrsByID := make(policy.AttributesByID)
+
 	for rows.Next() {
 		var id, organizationID gid.GID
-		err := rows.Scan(&id, &organizationID)
-		if err != nil {
+
+		if err := rows.Scan(&id, &organizationID); err != nil {
 			return nil, fmt.Errorf("cannot scan authorization attributes: %w", err)
 		}
 
diff --git a/pkg/coredata/third_party_risk_assessment.go b/pkg/coredata/third_party_risk_assessment.go
index 2488db3ab..d22b538dd 100644
--- a/pkg/coredata/third_party_risk_assessment.go
+++ b/pkg/coredata/third_party_risk_assessment.go
@@ -74,10 +74,11 @@ func (v *ThirdPartyRiskAssessment) AuthorizationAttributes(
 	defer rows.Close()
 
 	attrsByID := make(policy.AttributesByID)
+
 	for rows.Next() {
 		var id, organizationID gid.GID
-		err := rows.Scan(&id, &organizationID)
-		if err != nil {
+
+		if err := rows.Scan(&id, &organizationID); err != nil {
 			return nil, fmt.Errorf("cannot scan authorization attributes: %w", err)
 		}
 
diff --git a/pkg/coredata/third_party_service.go b/pkg/coredata/third_party_service.go
index b4622789b..097b9762d 100644
--- a/pkg/coredata/third_party_service.go
+++ b/pkg/coredata/third_party_service.go
@@ -72,10 +72,11 @@ func (vs *ThirdPartyService) AuthorizationAttributes(
 	defer rows.Close()
 
 	attrsByID := make(policy.AttributesByID)
+
 	for rows.Next() {
 		var id, organizationID gid.GID
-		err := rows.Scan(&id, &organizationID)
-		if err != nil {
+
+		if err := rows.Scan(&id, &organizationID); err != nil {
 			return nil, fmt.Errorf("cannot scan authorization attributes: %w", err)
 		}
 
diff --git a/pkg/coredata/tracker_pattern.go b/pkg/coredata/tracker_pattern.go
index 5071d5b30..010dc9e7a 100644
--- a/pkg/coredata/tracker_pattern.go
+++ b/pkg/coredata/tracker_pattern.go
@@ -99,10 +99,11 @@ func (tp *TrackerPattern) AuthorizationAttributes(
 	defer rows.Close()
 
 	attrsByID := make(policy.AttributesByID)
+
 	for rows.Next() {
 		var id, organizationID gid.GID
-		err := rows.Scan(&id, &organizationID)
-		if err != nil {
+
+		if err := rows.Scan(&id, &organizationID); err != nil {
 			return nil, fmt.Errorf("cannot scan authorization attributes: %w", err)
 		}
 
diff --git a/pkg/coredata/tracker_resource.go b/pkg/coredata/tracker_resource.go
index 1fe8ab853..683a65e7f 100644
--- a/pkg/coredata/tracker_resource.go
+++ b/pkg/coredata/tracker_resource.go
@@ -87,10 +87,11 @@ func (tr *TrackerResource) AuthorizationAttributes(
 	defer rows.Close()
 
 	attrsByID := make(policy.AttributesByID)
+
 	for rows.Next() {
 		var id, organizationID gid.GID
-		err := rows.Scan(&id, &organizationID)
-		if err != nil {
+
+		if err := rows.Scan(&id, &organizationID); err != nil {
 			return nil, fmt.Errorf("cannot scan authorization attributes: %w", err)
 		}
 
diff --git a/pkg/coredata/transfer_impact_assessment.go b/pkg/coredata/transfer_impact_assessment.go
index 90335c9aa..584e2d598 100644
--- a/pkg/coredata/transfer_impact_assessment.go
+++ b/pkg/coredata/transfer_impact_assessment.go
@@ -182,10 +182,11 @@ func (tia *TransferImpactAssessment) AuthorizationAttributes(
 	defer rows.Close()
 
 	attrsByID := make(policy.AttributesByID)
+
 	for rows.Next() {
 		var id, organizationID gid.GID
-		err := rows.Scan(&id, &organizationID)
-		if err != nil {
+
+		if err := rows.Scan(&id, &organizationID); err != nil {
 			return nil, fmt.Errorf("cannot scan authorization attributes: %w", err)
 		}
 
diff --git a/pkg/coredata/trust_center.go b/pkg/coredata/trust_center.go
index e2a64a0da..99259f30c 100644
--- a/pkg/coredata/trust_center.go
+++ b/pkg/coredata/trust_center.go
@@ -76,10 +76,11 @@ func (tc *TrustCenter) AuthorizationAttributes(
 	defer rows.Close()
 
 	attrsByID := make(policy.AttributesByID)
+
 	for rows.Next() {
 		var id, organizationID gid.GID
-		err := rows.Scan(&id, &organizationID)
-		if err != nil {
+
+		if err := rows.Scan(&id, &organizationID); err != nil {
 			return nil, fmt.Errorf("cannot scan authorization attributes: %w", err)
 		}
 
diff --git a/pkg/coredata/trust_center_access.go b/pkg/coredata/trust_center_access.go
index 3062100ce..3713462c2 100644
--- a/pkg/coredata/trust_center_access.go
+++ b/pkg/coredata/trust_center_access.go
@@ -72,10 +72,11 @@ func (tca *TrustCenterAccess) AuthorizationAttributes(
 	defer rows.Close()
 
 	attrsByID := make(policy.AttributesByID)
+
 	for rows.Next() {
 		var id, organizationID gid.GID
-		err := rows.Scan(&id, &organizationID)
-		if err != nil {
+
+		if err := rows.Scan(&id, &organizationID); err != nil {
 			return nil, fmt.Errorf("cannot scan authorization attributes: %w", err)
 		}
 
diff --git a/pkg/coredata/trust_center_document_access.go b/pkg/coredata/trust_center_document_access.go
index 7462dfe9b..5c876d5e3 100644
--- a/pkg/coredata/trust_center_document_access.go
+++ b/pkg/coredata/trust_center_document_access.go
@@ -73,10 +73,11 @@ func (tcda *TrustCenterDocumentAccess) AuthorizationAttributes(
 	defer rows.Close()
 
 	attrsByID := make(policy.AttributesByID)
+
 	for rows.Next() {
 		var id, organizationID gid.GID
-		err := rows.Scan(&id, &organizationID)
-		if err != nil {
+
+		if err := rows.Scan(&id, &organizationID); err != nil {
 			return nil, fmt.Errorf("cannot scan authorization attributes: %w", err)
 		}
 
diff --git a/pkg/coredata/trust_center_file.go b/pkg/coredata/trust_center_file.go
index 2001305ba..aff41e7c7 100644
--- a/pkg/coredata/trust_center_file.go
+++ b/pkg/coredata/trust_center_file.go
@@ -74,10 +74,11 @@ func (t *TrustCenterFile) AuthorizationAttributes(
 	defer rows.Close()
 
 	attrsByID := make(policy.AttributesByID)
+
 	for rows.Next() {
 		var id, organizationID gid.GID
-		err := rows.Scan(&id, &organizationID)
-		if err != nil {
+
+		if err := rows.Scan(&id, &organizationID); err != nil {
 			return nil, fmt.Errorf("cannot scan authorization attributes: %w", err)
 		}
 
diff --git a/pkg/coredata/trust_center_reference.go b/pkg/coredata/trust_center_reference.go
index b2f981d82..6c103c3ec 100644
--- a/pkg/coredata/trust_center_reference.go
+++ b/pkg/coredata/trust_center_reference.go
@@ -80,10 +80,11 @@ func (t *TrustCenterReference) AuthorizationAttributes(
 	defer rows.Close()
 
 	attrsByID := make(policy.AttributesByID)
+
 	for rows.Next() {
 		var id, organizationID gid.GID
-		err := rows.Scan(&id, &organizationID)
-		if err != nil {
+
+		if err := rows.Scan(&id, &organizationID); err != nil {
 			return nil, fmt.Errorf("cannot scan authorization attributes: %w", err)
 		}
 
diff --git a/pkg/coredata/webhook_subscription.go b/pkg/coredata/webhook_subscription.go
index 1070fc777..2b82edf65 100644
--- a/pkg/coredata/webhook_subscription.go
+++ b/pkg/coredata/webhook_subscription.go
@@ -104,10 +104,11 @@ func (w *WebhookSubscription) AuthorizationAttributes(
 	defer rows.Close()
 
 	attrsByID := make(policy.AttributesByID)
+
 	for rows.Next() {
 		var id, organizationID gid.GID
-		err := rows.Scan(&id, &organizationID)
-		if err != nil {
+
+		if err := rows.Scan(&id, &organizationID); err != nil {
 			return nil, fmt.Errorf("cannot scan authorization attributes: %w", err)
 		}
 
diff --git a/pkg/iam/authorizer.go b/pkg/iam/authorizer.go
index 092c07219..5367762bd 100644
--- a/pkg/iam/authorizer.go
+++ b/pkg/iam/authorizer.go
@@ -387,6 +387,7 @@ func (a *Authorizer) evaluateMultiInTx(
 	// On failure, ErrAssumptionRequired is recorded only against items that
 	// did not opt out.
 	var assumptionErr error
+
 	if requiresAssumptionCheck {
 		err := a.checkAssumption(
 			ctx,
@@ -431,6 +432,7 @@ func (a *Authorizer) evaluateMultiInTx(
 
 	decisions := make([]error, len(params.Items))
 	itemAttrs := make([]policy.Attributes, len(params.Items))
+
 	for i, item := range params.Items {
 		resAttrs := resourceAttrsByResourceID[item.Resource]
 		if len(item.ResourceAttributes) > 0 {
@@ -438,6 +440,7 @@ func (a *Authorizer) evaluateMultiInTx(
 			maps.Copy(merged, item.ResourceAttributes)
 			resAttrs = merged
 		}
+
 		itemAttrs[i] = resAttrs
 
 		if assumptionErr != nil && !item.SkipAssumptionCheck {
diff --git a/pkg/iam/authorizer_batch_test.go b/pkg/iam/authorizer_batch_test.go
index 2c8e40969..633b3b269 100644
--- a/pkg/iam/authorizer_batch_test.go
+++ b/pkg/iam/authorizer_batch_test.go
@@ -986,6 +986,7 @@ func insertBatchTestChildSession(
 	expiredAt := now.Add(30 * time.Minute)
 
 	var expireReason *coredata.ExpireReason
+
 	if expired {
 		reason := coredata.ExpireReasonRevoked
 		expireReason = &reason
@@ -1039,6 +1040,7 @@ func countAuditLogsForAction(t *testing.T, ctx context.Context, client *pg.Clien
 	t.Helper()
 
 	var count int
+
 	require.NoError(t, client.WithTx(ctx, func(ctx context.Context, tx pg.Tx) error {
 		if err := tx.QueryRow(
 			ctx,
diff --git a/pkg/iam/authorizer_unit_test.go b/pkg/iam/authorizer_unit_test.go
index 183d12567..967ea811a 100644
--- a/pkg/iam/authorizer_unit_test.go
+++ b/pkg/iam/authorizer_unit_test.go
@@ -83,7 +83,6 @@ func TestAuthorizer_ValidateInputs(t *testing.T) {
 		_, ok := errors.AsType[*ErrEmptyResourceBatch](err)
 		require.True(t, ok)
 	})
-
 }
 
 func TestAuthorizer_InternalErrorPaths(t *testing.T) {
diff --git a/pkg/iam/errors_test.go b/pkg/iam/errors_test.go
index 0f0952e0d..3f180ce94 100644
--- a/pkg/iam/errors_test.go
+++ b/pkg/iam/errors_test.go
@@ -106,6 +106,7 @@ func TestAuthorizeRelatedErrors_Error(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
+
 			if tt.err.Error() != tt.want {
 				t.Errorf("Error() = %q, want %q", tt.err.Error(), tt.want)
 			}