diff --git a/pkg/repository/network.go b/pkg/repository/network.go
index 4322d317..606b3cb6 100644
--- a/pkg/repository/network.go
+++ b/pkg/repository/network.go
@@ -138,7 +138,6 @@ func (r *networkRepository) create(ctx context.Context, req *adminv2.NetworkServ
 			return nil, err
 		}
 
-		var vrf uint
 		if parent.Vrf > 0 {
 			vrf = parent.Vrf
 		}
@@ -636,7 +635,7 @@ func (r *networkRepository) createChildPrefix(ctx context.Context, namespace *st
 	if namespace != nil {
 		_, err := r.s.ipam.CreateNamespace(ctx, &ipamv1.CreateNamespaceRequest{Namespace: *namespace})
 		if err != nil {
-			return nil, errorutil.Internal("unable to create namespace:%v", err)
+			return nil, errorutil.Internal("unable to create namespace:%w", err)
 		}
 		for _, parentPrefix := range parentPrefixes.OfFamily(af) {
 			_, err := r.s.ipam.GetPrefix(ctx, &ipamv1.GetPrefixRequest{
@@ -647,7 +646,7 @@ func (r *networkRepository) createChildPrefix(ctx context.Context, namespace *st
 				continue
 			}
 			if !errorutil.IsNotFound(err) {
-				return nil, errorutil.Internal("unable to get prefix %s from super network in ipam:%v", parentPrefix.String(), err)
+				return nil, errorutil.Internal("unable to get prefix %s from super network in ipam:%w", parentPrefix.String(), err)
 			}
 
 			_, err = r.s.ipam.CreatePrefix(ctx, &ipamv1.CreatePrefixRequest{
@@ -655,7 +654,7 @@ func (r *networkRepository) createChildPrefix(ctx context.Context, namespace *st
 				Namespace: namespace,
 			})
 			if err != nil {
-				return nil, errorutil.Internal("unable to create namespaced super network:%v", err)
+				return nil, errorutil.Internal("unable to create namespaced super network:%w", err)
 			}
 		}
 	}
diff --git a/pkg/request/authorize.go b/pkg/request/authorize.go
index e9f06a11..a9dd2012 100644
--- a/pkg/request/authorize.go
+++ b/pkg/request/authorize.go
@@ -39,13 +39,13 @@ func NewAuthorizer(log *slog.Logger, patg api.ProjectsAndTenantsGetter) Authoriz
 }
 
 func (a *authorizer) Authorize(ctx context.Context, token *apiv2.Token, req connect.AnyRequest) error {
+	if req == nil {
+		return errorutil.Internal("request is nil")
+	}
 	var (
 		method  = req.Spec().Procedure
 		subject string
 	)
-	if req == nil {
-		return errorutil.Internal("request is nil")
-	}
 
 	if permissions.IsProjectScope(req) {
 		project, ok := permissions.GetProjectFromRequest(req)
diff --git a/pkg/service/admin/machine/machine-service.go b/pkg/service/admin/machine/machine-service.go
index 2b56a4b4..a0f4fc33 100644
--- a/pkg/service/admin/machine/machine-service.go
+++ b/pkg/service/admin/machine/machine-service.go
@@ -75,7 +75,7 @@ func (m *machineServiceServer) List(ctx context.Context, rq *adminv2.MachineServ
 	}
 
 	partition := rq.Partition
-	if partition != nil {
+	if partition == nil {
 		if len(partitions) > 1 {
 			return nil, errorutil.InvalidArgument("no partition specified, but %d partitions available", len(partitions))
 		}
diff --git a/pkg/service/admin/tenant/tenant-service.go b/pkg/service/admin/tenant/tenant-service.go
index a62550a1..727297d5 100644
--- a/pkg/service/admin/tenant/tenant-service.go
+++ b/pkg/service/admin/tenant/tenant-service.go
@@ -73,7 +73,7 @@ func (t *tenantServiceServer) AddMember(ctx context.Context, req *adminv2.Tenant
 	existing, err := t.repo.Tenant().AdditionalMethods().Member(req.Tenant).Get(ctx, req.Member)
 
 	if err != nil && !errorutil.IsNotFound(err) {
-		return nil, errorutil.Internal("error reading tenant member:%v", err)
+		return nil, errorutil.Internal("error reading tenant member:%w", err)
 	}
 	if existing != nil {
 		return nil, errorutil.Conflict("tenant with id %q already is member in tenant: %q", req.Member, req.Tenant)
diff --git a/pkg/service/api/tenant/tenant-service.go b/pkg/service/api/tenant/tenant-service.go
index 760f244f..7fc80afc 100644
--- a/pkg/service/api/tenant/tenant-service.go
+++ b/pkg/service/api/tenant/tenant-service.go
@@ -119,10 +119,6 @@ func (u *tenantServiceServer) Create(ctx context.Context, req *apiv2.TenantServi
 
 	if pointer.SafeDeref(req.Email) == "" && ownTenant.Email != "" {
 		req.Email = new(ownTenant.Email)
-
-		if pointer.SafeDeref(req.Email) == "" {
-			return nil, errorutil.FailedPrecondition("email is required")
-		}
 	}
 
 	tenant, err := u.repo.Tenant().Create(ctx, req)