diff --git a/cmd/comment.md b/cmd/comment.md
index 706d3182..500fa950 100644
--- a/cmd/comment.md
+++ b/cmd/comment.md
@@ -52,12 +52,15 @@ No expected changes found.
 
 [Open in Overmind]({{ .ChangeUrl }})
 
-{{ if .Risks }}
 # <img width="24" alt="warning" src="{{ .AssetPath }}/risks.svg"> Risks
+{{ if not .Risks }}
+Overmind has not identified any risks associated with this change.
 
+This could be due to the change being low risk with no impact on other parts of the system, or involving resources that Overmind currently does not support.
+{{ else -}}
 {{ range .Risks }}
 ## <img width="18" alt="{{ .SeverityAlt }}" src="{{ $top.AssetPath }}/{{ .SeverityIcon }}"> {{ .Title }} [{{ .SeverityText }}]
 
 {{ .Description }}
 {{ end }}
-{{ end }}
+{{ end -}}
diff --git a/cmd/datamaps/awssource.go b/cmd/datamaps/awssource.go
index 2485c9d7..3ccbaf65 100644
--- a/cmd/datamaps/awssource.go
+++ b/cmd/datamaps/awssource.go
@@ -1069,6 +1069,14 @@ var AwssourceData = map[string][]TfMapData{
 			Scope:      "*",
 		},
 	},
+	"aws_vpc_endpoint": {
+		{
+			Type:       "ec2-vpc-endpoint",
+			Method:     sdp.QueryMethod_GET,
+			QueryField: "id",
+			Scope:      "*",
+		},
+	},
 	"aws_vpc_peering_connection": {
 		{
 			Type:       "ec2-vpc-peering-connection",
diff --git a/cmd/root.go b/cmd/root.go
index cf2b5c65..67aa9a9b 100644
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -215,14 +215,16 @@ func Execute() {
 			case loggedError:
 				log.WithContext(ctx).WithError(err.err).WithFields(err.fields).Error(err.message)
 			}
-			// if printing the error was not requested by the appropriate
-			// wrapper, only record the data to honeycomb and sentry, the
-			// command already has handled logging
-			cmdSpan.SetAttributes(
-				attribute.Bool("ovm.cli.fatalError", true),
-				attribute.String("ovm.cli.fatalError.msg", err.Error()),
-			)
-			cmdSpan.RecordError(err)
+			if cmdSpan != nil {
+				// if printing the error was not requested by the appropriate
+				// wrapper, only record the data to honeycomb and sentry, the
+				// command already has handled logging
+				cmdSpan.SetAttributes(
+					attribute.Bool("ovm.cli.fatalError", true),
+					attribute.String("ovm.cli.fatalError.msg", err.Error()),
+				)
+				cmdSpan.RecordError(err)
+			}
 			sentry.CaptureException(err)
 		}
 
diff --git a/cmd/tea_submitplan.go b/cmd/tea_submitplan.go
index c694c418..a27fae47 100644
--- a/cmd/tea_submitplan.go
+++ b/cmd/tea_submitplan.go
@@ -795,7 +795,13 @@ func (m submitPlanModel) FinalReport() string {
 		bits = append(bits, styleH1().Render("Blast Radius"))
 		bits = append(bits, fmt.Sprintf("\nItems: %v\nEdges: %v\n", m.blastRadiusItems, m.blastRadiusEdges))
 	}
-	if m.changeUrl != "" && len(m.risks) > 0 {
+	if len(m.risks) == 0 {
+		bits = append(bits, styleH1().Render("Potential Risks"))
+		bits = append(bits, "")
+		bits = append(bits, "Overmind has not identified any risks associated with this change.")
+		bits = append(bits, "")
+		bits = append(bits, "This could be due to the change being low risk with no impact on other parts of the system, or involving resources that Overmind currently does not support.")
+	} else if m.changeUrl != "" {
 		bits = append(bits, styleH1().Render("Potential Risks"))
 		bits = append(bits, "")
 		for _, r := range m.risks {
@@ -836,5 +842,6 @@ func (m submitPlanModel) FinalReport() string {
 		}
 		bits = append(bits, fmt.Sprintf("\nCheck the blast radius graph and risks at:\n%v\n\n", m.changeUrl))
 	}
+
 	return strings.Join(bits, "\n") + "\n"
 }