diff --git a/diag/helpers.go b/diag/helpers.go
index 8037b1301e5..d43eab3249f 100644
--- a/diag/helpers.go
+++ b/diag/helpers.go
@@ -10,6 +10,9 @@ import "fmt"
 //     return diag.FromErr(err)
 //   }
 func FromErr(err error) Diagnostics {
+	if err == nil {
+		return nil
+	}
 	return Diagnostics{
 		Diagnostic{
 			Severity: Error,