diff --git a/services/group/group.go b/services/group/group.go
index 65320bf304..e2e4168c93 100644
--- a/services/group/group.go
+++ b/services/group/group.go
@@ -38,7 +38,7 @@ func NewGroup(ctx context.Context, g *group_model.Group) error {
 	}
 
 	if err = RecalculateGroupAccess(ctx, g, true); err != nil {
-		return
+		return err
 	}
 
 	return committer.Commit()
diff --git a/services/group/group_test.go b/services/group/group_test.go
index e23e82e098..419a18b65c 100644
--- a/services/group/group_test.go
+++ b/services/group/group_test.go
@@ -1,13 +1,13 @@
 package group
 
 import (
-	user_model "code.gitea.io/gitea/models/user"
 	"testing"
 
 	"code.gitea.io/gitea/models/db"
 	group_model "code.gitea.io/gitea/models/group"
 	repo_model "code.gitea.io/gitea/models/repo"
 	"code.gitea.io/gitea/models/unittest"
+	user_model "code.gitea.io/gitea/models/user"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/services/repository/create.go b/services/repository/create.go
index e2d61bc0da..a6686595e6 100644
--- a/services/repository/create.go
+++ b/services/repository/create.go
@@ -5,7 +5,6 @@ package repository
 
 import (
 	"bytes"
-	group_model "code.gitea.io/gitea/models/group"
 	"context"
 	"fmt"
 	"os"
@@ -14,6 +13,7 @@ import (
 	"time"
 
 	"code.gitea.io/gitea/models/db"
+	group_model "code.gitea.io/gitea/models/group"
 	"code.gitea.io/gitea/models/organization"
 	"code.gitea.io/gitea/models/perm"
 	access_model "code.gitea.io/gitea/models/perm/access"