diff --git a/core/errgroup/errgroup.go b/core/errgroup/errgroup.go
index 0da190cb..c22d447a 100644
--- a/core/errgroup/errgroup.go
+++ b/core/errgroup/errgroup.go
@@ -240,6 +240,10 @@ func (g *Group) getAllChildren() []*Group {
 
 // Unwrap implements the dynamic std errors interface and it returns the parent Group.
 func (g *Group) Unwrap() error {
+	if g == nil {
+		return nil
+	}
+
 	return g.parent
 }