diff --git a/go.mod b/go.mod
index 3345909195..f7fcfccddf 100644
--- a/go.mod
+++ b/go.mod
@@ -269,7 +269,7 @@ require (
 require (
 	deps.dev/api/v3 v3.0.0-20240516073147-b352d7eeeae6
 	entgo.io/contrib v0.5.0
-	entgo.io/ent v0.13.0
+	entgo.io/ent v0.13.1
 	github.com/99designs/gqlgen v0.17.48
 	github.com/CycloneDX/cyclonedx-go v0.9.0
 	github.com/Khan/genqlient v0.7.0
diff --git a/go.sum b/go.sum
index 8dcca195a5..a26ddf6928 100644
--- a/go.sum
+++ b/go.sum
@@ -25,8 +25,8 @@ deps.dev/api/v3 v3.0.0-20240516073147-b352d7eeeae6 h1:pxD1B50Np8PJRcI3KkYHWCfbhO
 deps.dev/api/v3 v3.0.0-20240516073147-b352d7eeeae6/go.mod h1:DyBY3wNVqRCwvb4tLvz6LL/FupH3FMflEROyQAv2Vi0=
 entgo.io/contrib v0.5.0 h1:M4IqodImfUm327RDwNAITLNz3PsxVeC3rD4DPeVA8Gs=
 entgo.io/contrib v0.5.0/go.mod h1:q8dXQCmzqpSlVdT2bWDydjgznGcy3y4zmsYmVFC9V/U=
-entgo.io/ent v0.13.0 h1:DclxWczaCpyiKn6ZWVcJjq1zIKtJ11iNKy+08lNYsJE=
-entgo.io/ent v0.13.0/go.mod h1:+oU8oGna69xy29O+g+NEz+/TM7yJDhQQGJfuOWq1pT8=
+entgo.io/ent v0.13.1 h1:uD8QwN1h6SNphdCCzmkMN3feSUzNnVvV/WIkHKMbzOE=
+entgo.io/ent v0.13.1/go.mod h1:qCEmo+biw3ccBn9OyL4ZK5dfpwg++l1Gxwac5B1206A=
 github.com/99designs/gqlgen v0.17.48 h1:Wgk7n9PIdnmpsC1aJJV4eiZCGkAkoamKOtXAp/crpzQ=
 github.com/99designs/gqlgen v0.17.48/go.mod h1:hYeQ+ygPbcapbaHtHMbZ1DHMVNT+1tGU+fI+Hy4kqIo=
 github.com/Azure/azure-amqp-common-go/v3 v3.2.3 h1:uDF62mbd9bypXWi19V1bN5NZEO84JqgmI5G73ibAmrk=
diff --git a/pkg/assembler/backends/ent/billofmaterials.go b/pkg/assembler/backends/ent/billofmaterials.go
index cb4b44c3df..af3762e634 100644
--- a/pkg/assembler/backends/ent/billofmaterials.go
+++ b/pkg/assembler/backends/ent/billofmaterials.go
@@ -83,12 +83,10 @@ type BillOfMaterialsEdges struct {
 // PackageOrErr returns the Package value or an error if the edge
 // was not loaded in eager-loading, or loaded but was not found.
 func (e BillOfMaterialsEdges) PackageOrErr() (*PackageVersion, error) {
-	if e.loadedTypes[0] {
-		if e.Package == nil {
-			// Edge was loaded but was not found.
-			return nil, &NotFoundError{label: packageversion.Label}
-		}
+	if e.Package != nil {
 		return e.Package, nil
+	} else if e.loadedTypes[0] {
+		return nil, &NotFoundError{label: packageversion.Label}
 	}
 	return nil, &NotLoadedError{edge: "package"}
 }
@@ -96,12 +94,10 @@ func (e BillOfMaterialsEdges) PackageOrErr() (*PackageVersion, error) {
 // ArtifactOrErr returns the Artifact value or an error if the edge
 // was not loaded in eager-loading, or loaded but was not found.
 func (e BillOfMaterialsEdges) ArtifactOrErr() (*Artifact, error) {
-	if e.loadedTypes[1] {
-		if e.Artifact == nil {
-			// Edge was loaded but was not found.
-			return nil, &NotFoundError{label: artifact.Label}
-		}
+	if e.Artifact != nil {
 		return e.Artifact, nil
+	} else if e.loadedTypes[1] {
+		return nil, &NotFoundError{label: artifact.Label}
 	}
 	return nil, &NotLoadedError{edge: "artifact"}
 }
diff --git a/pkg/assembler/backends/ent/certification.go b/pkg/assembler/backends/ent/certification.go
index 3d64da38a4..7468a535ac 100644
--- a/pkg/assembler/backends/ent/certification.go
+++ b/pkg/assembler/backends/ent/certification.go
@@ -68,12 +68,10 @@ type CertificationEdges struct {
 // SourceOrErr returns the Source value or an error if the edge
 // was not loaded in eager-loading, or loaded but was not found.
 func (e CertificationEdges) SourceOrErr() (*SourceName, error) {
-	if e.loadedTypes[0] {
-		if e.Source == nil {
-			// Edge was loaded but was not found.
-			return nil, &NotFoundError{label: sourcename.Label}
-		}
+	if e.Source != nil {
 		return e.Source, nil
+	} else if e.loadedTypes[0] {
+		return nil, &NotFoundError{label: sourcename.Label}
 	}
 	return nil, &NotLoadedError{edge: "source"}
 }
@@ -81,12 +79,10 @@ func (e CertificationEdges) SourceOrErr() (*SourceName, error) {
 // PackageVersionOrErr returns the PackageVersion value or an error if the edge
 // was not loaded in eager-loading, or loaded but was not found.
 func (e CertificationEdges) PackageVersionOrErr() (*PackageVersion, error) {
-	if e.loadedTypes[1] {
-		if e.PackageVersion == nil {
-			// Edge was loaded but was not found.
-			return nil, &NotFoundError{label: packageversion.Label}
-		}
+	if e.PackageVersion != nil {
 		return e.PackageVersion, nil
+	} else if e.loadedTypes[1] {
+		return nil, &NotFoundError{label: packageversion.Label}
 	}
 	return nil, &NotLoadedError{edge: "package_version"}
 }
@@ -94,12 +90,10 @@ func (e CertificationEdges) PackageVersionOrErr() (*PackageVersion, error) {
 // AllVersionsOrErr returns the AllVersions value or an error if the edge
 // was not loaded in eager-loading, or loaded but was not found.
 func (e CertificationEdges) AllVersionsOrErr() (*PackageName, error) {
-	if e.loadedTypes[2] {
-		if e.AllVersions == nil {
-			// Edge was loaded but was not found.
-			return nil, &NotFoundError{label: packagename.Label}
-		}
+	if e.AllVersions != nil {
 		return e.AllVersions, nil
+	} else if e.loadedTypes[2] {
+		return nil, &NotFoundError{label: packagename.Label}
 	}
 	return nil, &NotLoadedError{edge: "all_versions"}
 }
@@ -107,12 +101,10 @@ func (e CertificationEdges) AllVersionsOrErr() (*PackageName, error) {
 // ArtifactOrErr returns the Artifact value or an error if the edge
 // was not loaded in eager-loading, or loaded but was not found.
 func (e CertificationEdges) ArtifactOrErr() (*Artifact, error) {
-	if e.loadedTypes[3] {
-		if e.Artifact == nil {
-			// Edge was loaded but was not found.
-			return nil, &NotFoundError{label: artifact.Label}
-		}
+	if e.Artifact != nil {
 		return e.Artifact, nil
+	} else if e.loadedTypes[3] {
+		return nil, &NotFoundError{label: artifact.Label}
 	}
 	return nil, &NotLoadedError{edge: "artifact"}
 }
diff --git a/pkg/assembler/backends/ent/certifylegal.go b/pkg/assembler/backends/ent/certifylegal.go
index a0ec3c3bbf..7bb08a3010 100644
--- a/pkg/assembler/backends/ent/certifylegal.go
+++ b/pkg/assembler/backends/ent/certifylegal.go
@@ -73,12 +73,10 @@ type CertifyLegalEdges struct {
 // PackageOrErr returns the Package value or an error if the edge
 // was not loaded in eager-loading, or loaded but was not found.
 func (e CertifyLegalEdges) PackageOrErr() (*PackageVersion, error) {
-	if e.loadedTypes[0] {
-		if e.Package == nil {
-			// Edge was loaded but was not found.
-			return nil, &NotFoundError{label: packageversion.Label}
-		}
+	if e.Package != nil {
 		return e.Package, nil
+	} else if e.loadedTypes[0] {
+		return nil, &NotFoundError{label: packageversion.Label}
 	}
 	return nil, &NotLoadedError{edge: "package"}
 }
@@ -86,12 +84,10 @@ func (e CertifyLegalEdges) PackageOrErr() (*PackageVersion, error) {
 // SourceOrErr returns the Source value or an error if the edge
 // was not loaded in eager-loading, or loaded but was not found.
 func (e CertifyLegalEdges) SourceOrErr() (*SourceName, error) {
-	if e.loadedTypes[1] {
-		if e.Source == nil {
-			// Edge was loaded but was not found.
-			return nil, &NotFoundError{label: sourcename.Label}
-		}
+	if e.Source != nil {
 		return e.Source, nil
+	} else if e.loadedTypes[1] {
+		return nil, &NotFoundError{label: sourcename.Label}
 	}
 	return nil, &NotLoadedError{edge: "source"}
 }
diff --git a/pkg/assembler/backends/ent/certifyscorecard.go b/pkg/assembler/backends/ent/certifyscorecard.go
index ba951fd736..1ad3639dc6 100644
--- a/pkg/assembler/backends/ent/certifyscorecard.go
+++ b/pkg/assembler/backends/ent/certifyscorecard.go
@@ -61,12 +61,10 @@ type CertifyScorecardEdges struct {
 // SourceOrErr returns the Source value or an error if the edge
 // was not loaded in eager-loading, or loaded but was not found.
 func (e CertifyScorecardEdges) SourceOrErr() (*SourceName, error) {
-	if e.loadedTypes[0] {
-		if e.Source == nil {
-			// Edge was loaded but was not found.
-			return nil, &NotFoundError{label: sourcename.Label}
-		}
+	if e.Source != nil {
 		return e.Source, nil
+	} else if e.loadedTypes[0] {
+		return nil, &NotFoundError{label: sourcename.Label}
 	}
 	return nil, &NotLoadedError{edge: "source"}
 }
diff --git a/pkg/assembler/backends/ent/certifyvex.go b/pkg/assembler/backends/ent/certifyvex.go
index 355295e4ed..8aa9605c91 100644
--- a/pkg/assembler/backends/ent/certifyvex.go
+++ b/pkg/assembler/backends/ent/certifyvex.go
@@ -67,12 +67,10 @@ type CertifyVexEdges struct {
 // PackageOrErr returns the Package value or an error if the edge
 // was not loaded in eager-loading, or loaded but was not found.
 func (e CertifyVexEdges) PackageOrErr() (*PackageVersion, error) {
-	if e.loadedTypes[0] {
-		if e.Package == nil {
-			// Edge was loaded but was not found.
-			return nil, &NotFoundError{label: packageversion.Label}
-		}
+	if e.Package != nil {
 		return e.Package, nil
+	} else if e.loadedTypes[0] {
+		return nil, &NotFoundError{label: packageversion.Label}
 	}
 	return nil, &NotLoadedError{edge: "package"}
 }
@@ -80,12 +78,10 @@ func (e CertifyVexEdges) PackageOrErr() (*PackageVersion, error) {
 // ArtifactOrErr returns the Artifact value or an error if the edge
 // was not loaded in eager-loading, or loaded but was not found.
 func (e CertifyVexEdges) ArtifactOrErr() (*Artifact, error) {
-	if e.loadedTypes[1] {
-		if e.Artifact == nil {
-			// Edge was loaded but was not found.
-			return nil, &NotFoundError{label: artifact.Label}
-		}
+	if e.Artifact != nil {
 		return e.Artifact, nil
+	} else if e.loadedTypes[1] {
+		return nil, &NotFoundError{label: artifact.Label}
 	}
 	return nil, &NotLoadedError{edge: "artifact"}
 }
@@ -93,12 +89,10 @@ func (e CertifyVexEdges) ArtifactOrErr() (*Artifact, error) {
 // VulnerabilityOrErr returns the Vulnerability value or an error if the edge
 // was not loaded in eager-loading, or loaded but was not found.
 func (e CertifyVexEdges) VulnerabilityOrErr() (*VulnerabilityID, error) {
-	if e.loadedTypes[2] {
-		if e.Vulnerability == nil {
-			// Edge was loaded but was not found.
-			return nil, &NotFoundError{label: vulnerabilityid.Label}
-		}
+	if e.Vulnerability != nil {
 		return e.Vulnerability, nil
+	} else if e.loadedTypes[2] {
+		return nil, &NotFoundError{label: vulnerabilityid.Label}
 	}
 	return nil, &NotLoadedError{edge: "vulnerability"}
 }
diff --git a/pkg/assembler/backends/ent/certifyvuln.go b/pkg/assembler/backends/ent/certifyvuln.go
index 63113a95a2..13bbdfafd6 100644
--- a/pkg/assembler/backends/ent/certifyvuln.go
+++ b/pkg/assembler/backends/ent/certifyvuln.go
@@ -62,12 +62,10 @@ type CertifyVulnEdges struct {
 // VulnerabilityOrErr returns the Vulnerability value or an error if the edge
 // was not loaded in eager-loading, or loaded but was not found.
 func (e CertifyVulnEdges) VulnerabilityOrErr() (*VulnerabilityID, error) {
-	if e.loadedTypes[0] {
-		if e.Vulnerability == nil {
-			// Edge was loaded but was not found.
-			return nil, &NotFoundError{label: vulnerabilityid.Label}
-		}
+	if e.Vulnerability != nil {
 		return e.Vulnerability, nil
+	} else if e.loadedTypes[0] {
+		return nil, &NotFoundError{label: vulnerabilityid.Label}
 	}
 	return nil, &NotLoadedError{edge: "vulnerability"}
 }
@@ -75,12 +73,10 @@ func (e CertifyVulnEdges) VulnerabilityOrErr() (*VulnerabilityID, error) {
 // PackageOrErr returns the Package value or an error if the edge
 // was not loaded in eager-loading, or loaded but was not found.
 func (e CertifyVulnEdges) PackageOrErr() (*PackageVersion, error) {
-	if e.loadedTypes[1] {
-		if e.Package == nil {
-			// Edge was loaded but was not found.
-			return nil, &NotFoundError{label: packageversion.Label}
-		}
+	if e.Package != nil {
 		return e.Package, nil
+	} else if e.loadedTypes[1] {
+		return nil, &NotFoundError{label: packageversion.Label}
 	}
 	return nil, &NotLoadedError{edge: "package"}
 }
diff --git a/pkg/assembler/backends/ent/dependency.go b/pkg/assembler/backends/ent/dependency.go
index 891ad35e89..4de27f3756 100644
--- a/pkg/assembler/backends/ent/dependency.go
+++ b/pkg/assembler/backends/ent/dependency.go
@@ -65,12 +65,10 @@ type DependencyEdges struct {
 // PackageOrErr returns the Package value or an error if the edge
 // was not loaded in eager-loading, or loaded but was not found.
 func (e DependencyEdges) PackageOrErr() (*PackageVersion, error) {
-	if e.loadedTypes[0] {
-		if e.Package == nil {
-			// Edge was loaded but was not found.
-			return nil, &NotFoundError{label: packageversion.Label}
-		}
+	if e.Package != nil {
 		return e.Package, nil
+	} else if e.loadedTypes[0] {
+		return nil, &NotFoundError{label: packageversion.Label}
 	}
 	return nil, &NotLoadedError{edge: "package"}
 }
@@ -78,12 +76,10 @@ func (e DependencyEdges) PackageOrErr() (*PackageVersion, error) {
 // DependentPackageNameOrErr returns the DependentPackageName value or an error if the edge
 // was not loaded in eager-loading, or loaded but was not found.
 func (e DependencyEdges) DependentPackageNameOrErr() (*PackageName, error) {
-	if e.loadedTypes[1] {
-		if e.DependentPackageName == nil {
-			// Edge was loaded but was not found.
-			return nil, &NotFoundError{label: packagename.Label}
-		}
+	if e.DependentPackageName != nil {
 		return e.DependentPackageName, nil
+	} else if e.loadedTypes[1] {
+		return nil, &NotFoundError{label: packagename.Label}
 	}
 	return nil, &NotLoadedError{edge: "dependent_package_name"}
 }
@@ -91,12 +87,10 @@ func (e DependencyEdges) DependentPackageNameOrErr() (*PackageName, error) {
 // DependentPackageVersionOrErr returns the DependentPackageVersion value or an error if the edge
 // was not loaded in eager-loading, or loaded but was not found.
 func (e DependencyEdges) DependentPackageVersionOrErr() (*PackageVersion, error) {
-	if e.loadedTypes[2] {
-		if e.DependentPackageVersion == nil {
-			// Edge was loaded but was not found.
-			return nil, &NotFoundError{label: packageversion.Label}
-		}
+	if e.DependentPackageVersion != nil {
 		return e.DependentPackageVersion, nil
+	} else if e.loadedTypes[2] {
+		return nil, &NotFoundError{label: packageversion.Label}
 	}
 	return nil, &NotLoadedError{edge: "dependent_package_version"}
 }
diff --git a/pkg/assembler/backends/ent/hashequal.go b/pkg/assembler/backends/ent/hashequal.go
index 656f02973d..fe9ceba10f 100644
--- a/pkg/assembler/backends/ent/hashequal.go
+++ b/pkg/assembler/backends/ent/hashequal.go
@@ -54,12 +54,10 @@ type HashEqualEdges struct {
 // ArtifactAOrErr returns the ArtifactA value or an error if the edge
 // was not loaded in eager-loading, or loaded but was not found.
 func (e HashEqualEdges) ArtifactAOrErr() (*Artifact, error) {
-	if e.loadedTypes[0] {
-		if e.ArtifactA == nil {
-			// Edge was loaded but was not found.
-			return nil, &NotFoundError{label: artifact.Label}
-		}
+	if e.ArtifactA != nil {
 		return e.ArtifactA, nil
+	} else if e.loadedTypes[0] {
+		return nil, &NotFoundError{label: artifact.Label}
 	}
 	return nil, &NotLoadedError{edge: "artifact_a"}
 }
@@ -67,12 +65,10 @@ func (e HashEqualEdges) ArtifactAOrErr() (*Artifact, error) {
 // ArtifactBOrErr returns the ArtifactB value or an error if the edge
 // was not loaded in eager-loading, or loaded but was not found.
 func (e HashEqualEdges) ArtifactBOrErr() (*Artifact, error) {
-	if e.loadedTypes[1] {
-		if e.ArtifactB == nil {
-			// Edge was loaded but was not found.
-			return nil, &NotFoundError{label: artifact.Label}
-		}
+	if e.ArtifactB != nil {
 		return e.ArtifactB, nil
+	} else if e.loadedTypes[1] {
+		return nil, &NotFoundError{label: artifact.Label}
 	}
 	return nil, &NotLoadedError{edge: "artifact_b"}
 }
diff --git a/pkg/assembler/backends/ent/hasmetadata.go b/pkg/assembler/backends/ent/hasmetadata.go
index 101e25c1d6..74e6fdd41f 100644
--- a/pkg/assembler/backends/ent/hasmetadata.go
+++ b/pkg/assembler/backends/ent/hasmetadata.go
@@ -70,12 +70,10 @@ type HasMetadataEdges struct {
 // SourceOrErr returns the Source value or an error if the edge
 // was not loaded in eager-loading, or loaded but was not found.
 func (e HasMetadataEdges) SourceOrErr() (*SourceName, error) {
-	if e.loadedTypes[0] {
-		if e.Source == nil {
-			// Edge was loaded but was not found.
-			return nil, &NotFoundError{label: sourcename.Label}
-		}
+	if e.Source != nil {
 		return e.Source, nil
+	} else if e.loadedTypes[0] {
+		return nil, &NotFoundError{label: sourcename.Label}
 	}
 	return nil, &NotLoadedError{edge: "source"}
 }
@@ -83,12 +81,10 @@ func (e HasMetadataEdges) SourceOrErr() (*SourceName, error) {
 // PackageVersionOrErr returns the PackageVersion value or an error if the edge
 // was not loaded in eager-loading, or loaded but was not found.
 func (e HasMetadataEdges) PackageVersionOrErr() (*PackageVersion, error) {
-	if e.loadedTypes[1] {
-		if e.PackageVersion == nil {
-			// Edge was loaded but was not found.
-			return nil, &NotFoundError{label: packageversion.Label}
-		}
+	if e.PackageVersion != nil {
 		return e.PackageVersion, nil
+	} else if e.loadedTypes[1] {
+		return nil, &NotFoundError{label: packageversion.Label}
 	}
 	return nil, &NotLoadedError{edge: "package_version"}
 }
@@ -96,12 +92,10 @@ func (e HasMetadataEdges) PackageVersionOrErr() (*PackageVersion, error) {
 // AllVersionsOrErr returns the AllVersions value or an error if the edge
 // was not loaded in eager-loading, or loaded but was not found.
 func (e HasMetadataEdges) AllVersionsOrErr() (*PackageName, error) {
-	if e.loadedTypes[2] {
-		if e.AllVersions == nil {
-			// Edge was loaded but was not found.
-			return nil, &NotFoundError{label: packagename.Label}
-		}
+	if e.AllVersions != nil {
 		return e.AllVersions, nil
+	} else if e.loadedTypes[2] {
+		return nil, &NotFoundError{label: packagename.Label}
 	}
 	return nil, &NotLoadedError{edge: "all_versions"}
 }
@@ -109,12 +103,10 @@ func (e HasMetadataEdges) AllVersionsOrErr() (*PackageName, error) {
 // ArtifactOrErr returns the Artifact value or an error if the edge
 // was not loaded in eager-loading, or loaded but was not found.
 func (e HasMetadataEdges) ArtifactOrErr() (*Artifact, error) {
-	if e.loadedTypes[3] {
-		if e.Artifact == nil {
-			// Edge was loaded but was not found.
-			return nil, &NotFoundError{label: artifact.Label}
-		}
+	if e.Artifact != nil {
 		return e.Artifact, nil
+	} else if e.loadedTypes[3] {
+		return nil, &NotFoundError{label: artifact.Label}
 	}
 	return nil, &NotLoadedError{edge: "artifact"}
 }
diff --git a/pkg/assembler/backends/ent/hassourceat.go b/pkg/assembler/backends/ent/hassourceat.go
index 1edd959a02..9725a58cf5 100644
--- a/pkg/assembler/backends/ent/hassourceat.go
+++ b/pkg/assembler/backends/ent/hassourceat.go
@@ -61,12 +61,10 @@ type HasSourceAtEdges struct {
 // PackageVersionOrErr returns the PackageVersion value or an error if the edge
 // was not loaded in eager-loading, or loaded but was not found.
 func (e HasSourceAtEdges) PackageVersionOrErr() (*PackageVersion, error) {
-	if e.loadedTypes[0] {
-		if e.PackageVersion == nil {
-			// Edge was loaded but was not found.
-			return nil, &NotFoundError{label: packageversion.Label}
-		}
+	if e.PackageVersion != nil {
 		return e.PackageVersion, nil
+	} else if e.loadedTypes[0] {
+		return nil, &NotFoundError{label: packageversion.Label}
 	}
 	return nil, &NotLoadedError{edge: "package_version"}
 }
@@ -74,12 +72,10 @@ func (e HasSourceAtEdges) PackageVersionOrErr() (*PackageVersion, error) {
 // AllVersionsOrErr returns the AllVersions value or an error if the edge
 // was not loaded in eager-loading, or loaded but was not found.
 func (e HasSourceAtEdges) AllVersionsOrErr() (*PackageName, error) {
-	if e.loadedTypes[1] {
-		if e.AllVersions == nil {
-			// Edge was loaded but was not found.
-			return nil, &NotFoundError{label: packagename.Label}
-		}
+	if e.AllVersions != nil {
 		return e.AllVersions, nil
+	} else if e.loadedTypes[1] {
+		return nil, &NotFoundError{label: packagename.Label}
 	}
 	return nil, &NotLoadedError{edge: "all_versions"}
 }
@@ -87,12 +83,10 @@ func (e HasSourceAtEdges) AllVersionsOrErr() (*PackageName, error) {
 // SourceOrErr returns the Source value or an error if the edge
 // was not loaded in eager-loading, or loaded but was not found.
 func (e HasSourceAtEdges) SourceOrErr() (*SourceName, error) {
-	if e.loadedTypes[2] {
-		if e.Source == nil {
-			// Edge was loaded but was not found.
-			return nil, &NotFoundError{label: sourcename.Label}
-		}
+	if e.Source != nil {
 		return e.Source, nil
+	} else if e.loadedTypes[2] {
+		return nil, &NotFoundError{label: sourcename.Label}
 	}
 	return nil, &NotLoadedError{edge: "source"}
 }
diff --git a/pkg/assembler/backends/ent/occurrence.go b/pkg/assembler/backends/ent/occurrence.go
index d40d626cab..f9bf9b2a98 100644
--- a/pkg/assembler/backends/ent/occurrence.go
+++ b/pkg/assembler/backends/ent/occurrence.go
@@ -62,12 +62,10 @@ type OccurrenceEdges struct {
 // ArtifactOrErr returns the Artifact value or an error if the edge
 // was not loaded in eager-loading, or loaded but was not found.
 func (e OccurrenceEdges) ArtifactOrErr() (*Artifact, error) {
-	if e.loadedTypes[0] {
-		if e.Artifact == nil {
-			// Edge was loaded but was not found.
-			return nil, &NotFoundError{label: artifact.Label}
-		}
+	if e.Artifact != nil {
 		return e.Artifact, nil
+	} else if e.loadedTypes[0] {
+		return nil, &NotFoundError{label: artifact.Label}
 	}
 	return nil, &NotLoadedError{edge: "artifact"}
 }
@@ -75,12 +73,10 @@ func (e OccurrenceEdges) ArtifactOrErr() (*Artifact, error) {
 // PackageOrErr returns the Package value or an error if the edge
 // was not loaded in eager-loading, or loaded but was not found.
 func (e OccurrenceEdges) PackageOrErr() (*PackageVersion, error) {
-	if e.loadedTypes[1] {
-		if e.Package == nil {
-			// Edge was loaded but was not found.
-			return nil, &NotFoundError{label: packageversion.Label}
-		}
+	if e.Package != nil {
 		return e.Package, nil
+	} else if e.loadedTypes[1] {
+		return nil, &NotFoundError{label: packageversion.Label}
 	}
 	return nil, &NotLoadedError{edge: "package"}
 }
@@ -88,12 +84,10 @@ func (e OccurrenceEdges) PackageOrErr() (*PackageVersion, error) {
 // SourceOrErr returns the Source value or an error if the edge
 // was not loaded in eager-loading, or loaded but was not found.
 func (e OccurrenceEdges) SourceOrErr() (*SourceName, error) {
-	if e.loadedTypes[2] {
-		if e.Source == nil {
-			// Edge was loaded but was not found.
-			return nil, &NotFoundError{label: sourcename.Label}
-		}
+	if e.Source != nil {
 		return e.Source, nil
+	} else if e.loadedTypes[2] {
+		return nil, &NotFoundError{label: sourcename.Label}
 	}
 	return nil, &NotLoadedError{edge: "source"}
 }
diff --git a/pkg/assembler/backends/ent/packageversion.go b/pkg/assembler/backends/ent/packageversion.go
index fe887c70e6..2e72321639 100644
--- a/pkg/assembler/backends/ent/packageversion.go
+++ b/pkg/assembler/backends/ent/packageversion.go
@@ -93,12 +93,10 @@ type PackageVersionEdges struct {
 // NameOrErr returns the Name value or an error if the edge
 // was not loaded in eager-loading, or loaded but was not found.
 func (e PackageVersionEdges) NameOrErr() (*PackageName, error) {
-	if e.loadedTypes[0] {
-		if e.Name == nil {
-			// Edge was loaded but was not found.
-			return nil, &NotFoundError{label: packagename.Label}
-		}
+	if e.Name != nil {
 		return e.Name, nil
+	} else if e.loadedTypes[0] {
+		return nil, &NotFoundError{label: packagename.Label}
 	}
 	return nil, &NotLoadedError{edge: "name"}
 }
diff --git a/pkg/assembler/backends/ent/pkgequal.go b/pkg/assembler/backends/ent/pkgequal.go
index 294852ab64..6f3fbf5946 100644
--- a/pkg/assembler/backends/ent/pkgequal.go
+++ b/pkg/assembler/backends/ent/pkgequal.go
@@ -54,12 +54,10 @@ type PkgEqualEdges struct {
 // PackageAOrErr returns the PackageA value or an error if the edge
 // was not loaded in eager-loading, or loaded but was not found.
 func (e PkgEqualEdges) PackageAOrErr() (*PackageVersion, error) {
-	if e.loadedTypes[0] {
-		if e.PackageA == nil {
-			// Edge was loaded but was not found.
-			return nil, &NotFoundError{label: packageversion.Label}
-		}
+	if e.PackageA != nil {
 		return e.PackageA, nil
+	} else if e.loadedTypes[0] {
+		return nil, &NotFoundError{label: packageversion.Label}
 	}
 	return nil, &NotLoadedError{edge: "package_a"}
 }
@@ -67,12 +65,10 @@ func (e PkgEqualEdges) PackageAOrErr() (*PackageVersion, error) {
 // PackageBOrErr returns the PackageB value or an error if the edge
 // was not loaded in eager-loading, or loaded but was not found.
 func (e PkgEqualEdges) PackageBOrErr() (*PackageVersion, error) {
-	if e.loadedTypes[1] {
-		if e.PackageB == nil {
-			// Edge was loaded but was not found.
-			return nil, &NotFoundError{label: packageversion.Label}
-		}
+	if e.PackageB != nil {
 		return e.PackageB, nil
+	} else if e.loadedTypes[1] {
+		return nil, &NotFoundError{label: packageversion.Label}
 	}
 	return nil, &NotLoadedError{edge: "package_b"}
 }
diff --git a/pkg/assembler/backends/ent/pointofcontact.go b/pkg/assembler/backends/ent/pointofcontact.go
index db4e8ed4a8..b0c3bdc892 100644
--- a/pkg/assembler/backends/ent/pointofcontact.go
+++ b/pkg/assembler/backends/ent/pointofcontact.go
@@ -70,12 +70,10 @@ type PointOfContactEdges struct {
 // SourceOrErr returns the Source value or an error if the edge
 // was not loaded in eager-loading, or loaded but was not found.
 func (e PointOfContactEdges) SourceOrErr() (*SourceName, error) {
-	if e.loadedTypes[0] {
-		if e.Source == nil {
-			// Edge was loaded but was not found.
-			return nil, &NotFoundError{label: sourcename.Label}
-		}
+	if e.Source != nil {
 		return e.Source, nil
+	} else if e.loadedTypes[0] {
+		return nil, &NotFoundError{label: sourcename.Label}
 	}
 	return nil, &NotLoadedError{edge: "source"}
 }
@@ -83,12 +81,10 @@ func (e PointOfContactEdges) SourceOrErr() (*SourceName, error) {
 // PackageVersionOrErr returns the PackageVersion value or an error if the edge
 // was not loaded in eager-loading, or loaded but was not found.
 func (e PointOfContactEdges) PackageVersionOrErr() (*PackageVersion, error) {
-	if e.loadedTypes[1] {
-		if e.PackageVersion == nil {
-			// Edge was loaded but was not found.
-			return nil, &NotFoundError{label: packageversion.Label}
-		}
+	if e.PackageVersion != nil {
 		return e.PackageVersion, nil
+	} else if e.loadedTypes[1] {
+		return nil, &NotFoundError{label: packageversion.Label}
 	}
 	return nil, &NotLoadedError{edge: "package_version"}
 }
@@ -96,12 +92,10 @@ func (e PointOfContactEdges) PackageVersionOrErr() (*PackageVersion, error) {
 // AllVersionsOrErr returns the AllVersions value or an error if the edge
 // was not loaded in eager-loading, or loaded but was not found.
 func (e PointOfContactEdges) AllVersionsOrErr() (*PackageName, error) {
-	if e.loadedTypes[2] {
-		if e.AllVersions == nil {
-			// Edge was loaded but was not found.
-			return nil, &NotFoundError{label: packagename.Label}
-		}
+	if e.AllVersions != nil {
 		return e.AllVersions, nil
+	} else if e.loadedTypes[2] {
+		return nil, &NotFoundError{label: packagename.Label}
 	}
 	return nil, &NotLoadedError{edge: "all_versions"}
 }
@@ -109,12 +103,10 @@ func (e PointOfContactEdges) AllVersionsOrErr() (*PackageName, error) {
 // ArtifactOrErr returns the Artifact value or an error if the edge
 // was not loaded in eager-loading, or loaded but was not found.
 func (e PointOfContactEdges) ArtifactOrErr() (*Artifact, error) {
-	if e.loadedTypes[3] {
-		if e.Artifact == nil {
-			// Edge was loaded but was not found.
-			return nil, &NotFoundError{label: artifact.Label}
-		}
+	if e.Artifact != nil {
 		return e.Artifact, nil
+	} else if e.loadedTypes[3] {
+		return nil, &NotFoundError{label: artifact.Label}
 	}
 	return nil, &NotLoadedError{edge: "artifact"}
 }
diff --git a/pkg/assembler/backends/ent/runtime/runtime.go b/pkg/assembler/backends/ent/runtime/runtime.go
index e8e48b0384..82cc281458 100644
--- a/pkg/assembler/backends/ent/runtime/runtime.go
+++ b/pkg/assembler/backends/ent/runtime/runtime.go
@@ -5,6 +5,6 @@ package runtime
 // The schema-stitching logic is generated in github.com/guacsec/guac/pkg/assembler/backends/ent/runtime.go
 
 const (
-	Version = "v0.13.0"                                         // Version of ent codegen.
-	Sum     = "h1:DclxWczaCpyiKn6ZWVcJjq1zIKtJ11iNKy+08lNYsJE=" // Sum of ent codegen.
+	Version = "v0.13.1"                                         // Version of ent codegen.
+	Sum     = "h1:uD8QwN1h6SNphdCCzmkMN3feSUzNnVvV/WIkHKMbzOE=" // Sum of ent codegen.
 )
diff --git a/pkg/assembler/backends/ent/slsaattestation.go b/pkg/assembler/backends/ent/slsaattestation.go
index a071f00077..9a7e776474 100644
--- a/pkg/assembler/backends/ent/slsaattestation.go
+++ b/pkg/assembler/backends/ent/slsaattestation.go
@@ -79,12 +79,10 @@ func (e SLSAAttestationEdges) BuiltFromOrErr() ([]*Artifact, error) {
 // BuiltByOrErr returns the BuiltBy value or an error if the edge
 // was not loaded in eager-loading, or loaded but was not found.
 func (e SLSAAttestationEdges) BuiltByOrErr() (*Builder, error) {
-	if e.loadedTypes[1] {
-		if e.BuiltBy == nil {
-			// Edge was loaded but was not found.
-			return nil, &NotFoundError{label: builder.Label}
-		}
+	if e.BuiltBy != nil {
 		return e.BuiltBy, nil
+	} else if e.loadedTypes[1] {
+		return nil, &NotFoundError{label: builder.Label}
 	}
 	return nil, &NotLoadedError{edge: "built_by"}
 }
@@ -92,12 +90,10 @@ func (e SLSAAttestationEdges) BuiltByOrErr() (*Builder, error) {
 // SubjectOrErr returns the Subject value or an error if the edge
 // was not loaded in eager-loading, or loaded but was not found.
 func (e SLSAAttestationEdges) SubjectOrErr() (*Artifact, error) {
-	if e.loadedTypes[2] {
-		if e.Subject == nil {
-			// Edge was loaded but was not found.
-			return nil, &NotFoundError{label: artifact.Label}
-		}
+	if e.Subject != nil {
 		return e.Subject, nil
+	} else if e.loadedTypes[2] {
+		return nil, &NotFoundError{label: artifact.Label}
 	}
 	return nil, &NotLoadedError{edge: "subject"}
 }
diff --git a/pkg/assembler/backends/ent/vulnequal.go b/pkg/assembler/backends/ent/vulnequal.go
index 12f79e096f..6a0f77bdf2 100644
--- a/pkg/assembler/backends/ent/vulnequal.go
+++ b/pkg/assembler/backends/ent/vulnequal.go
@@ -54,12 +54,10 @@ type VulnEqualEdges struct {
 // VulnerabilityAOrErr returns the VulnerabilityA value or an error if the edge
 // was not loaded in eager-loading, or loaded but was not found.
 func (e VulnEqualEdges) VulnerabilityAOrErr() (*VulnerabilityID, error) {
-	if e.loadedTypes[0] {
-		if e.VulnerabilityA == nil {
-			// Edge was loaded but was not found.
-			return nil, &NotFoundError{label: vulnerabilityid.Label}
-		}
+	if e.VulnerabilityA != nil {
 		return e.VulnerabilityA, nil
+	} else if e.loadedTypes[0] {
+		return nil, &NotFoundError{label: vulnerabilityid.Label}
 	}
 	return nil, &NotLoadedError{edge: "vulnerability_a"}
 }
@@ -67,12 +65,10 @@ func (e VulnEqualEdges) VulnerabilityAOrErr() (*VulnerabilityID, error) {
 // VulnerabilityBOrErr returns the VulnerabilityB value or an error if the edge
 // was not loaded in eager-loading, or loaded but was not found.
 func (e VulnEqualEdges) VulnerabilityBOrErr() (*VulnerabilityID, error) {
-	if e.loadedTypes[1] {
-		if e.VulnerabilityB == nil {
-			// Edge was loaded but was not found.
-			return nil, &NotFoundError{label: vulnerabilityid.Label}
-		}
+	if e.VulnerabilityB != nil {
 		return e.VulnerabilityB, nil
+	} else if e.loadedTypes[1] {
+		return nil, &NotFoundError{label: vulnerabilityid.Label}
 	}
 	return nil, &NotLoadedError{edge: "vulnerability_b"}
 }
diff --git a/pkg/assembler/backends/ent/vulnerabilitymetadata.go b/pkg/assembler/backends/ent/vulnerabilitymetadata.go
index 923d4016fb..305fe4994d 100644
--- a/pkg/assembler/backends/ent/vulnerabilitymetadata.go
+++ b/pkg/assembler/backends/ent/vulnerabilitymetadata.go
@@ -53,12 +53,10 @@ type VulnerabilityMetadataEdges struct {
 // VulnerabilityIDOrErr returns the VulnerabilityID value or an error if the edge
 // was not loaded in eager-loading, or loaded but was not found.
 func (e VulnerabilityMetadataEdges) VulnerabilityIDOrErr() (*VulnerabilityID, error) {
-	if e.loadedTypes[0] {
-		if e.VulnerabilityID == nil {
-			// Edge was loaded but was not found.
-			return nil, &NotFoundError{label: vulnerabilityid.Label}
-		}
+	if e.VulnerabilityID != nil {
 		return e.VulnerabilityID, nil
+	} else if e.loadedTypes[0] {
+		return nil, &NotFoundError{label: vulnerabilityid.Label}
 	}
 	return nil, &NotLoadedError{edge: "vulnerability_id"}
 }