diff --git a/.golangci.yaml b/.golangci.yaml
index 919a6358b..7598646d3 100644
--- a/.golangci.yaml
+++ b/.golangci.yaml
@@ -10,6 +10,11 @@ linters:
     - unused
     - gofmt
 linters-settings:
+  govet:
+    enable-all: true
+    disable:
+      - fieldalignment
+      - shadow
   gofmt:
     rewrite-rules:
       - pattern: 'a[b:len(a)]'
diff --git a/bundle/run/job.go b/bundle/run/job.go
index 3f6ed3970..35a6ef4ff 100644
--- a/bundle/run/job.go
+++ b/bundle/run/job.go
@@ -203,7 +203,7 @@ func (r *jobRunner) Run(ctx context.Context, opts *Options) (output.RunOutput, e
 		logDebug(r)
 		logProgress(r)
 	}).GetWithTimeout(jobRunTimeout)
-	if err != nil && runId != nil {
+	if err != nil {
 		r.logFailedTasks(ctx, *runId)
 	}
 	if err != nil {
diff --git a/cmd/labs/project/entrypoint.go b/cmd/labs/project/entrypoint.go
index 99edf83c8..5210c85f9 100644
--- a/cmd/labs/project/entrypoint.go
+++ b/cmd/labs/project/entrypoint.go
@@ -190,9 +190,6 @@ func (e *Entrypoint) getLoginConfig(cmd *cobra.Command) (*loginConfig, *config.C
 	if isNoLoginConfig && !e.IsBundleAware {
 		return nil, nil, ErrNoLoginConfig
 	}
-	if !isNoLoginConfig && err != nil {
-		return nil, nil, fmt.Errorf("load: %w", err)
-	}
 	if e.IsAccountLevel {
 		log.Debugf(ctx, "Using account-level login profile: %s", lc.AccountProfile)
 		cfg, err := e.envAwareConfigWithProfile(ctx, lc.AccountProfile)
diff --git a/libs/template/renderer.go b/libs/template/renderer.go
index 0f30a67d0..5030cd9df 100644
--- a/libs/template/renderer.go
+++ b/libs/template/renderer.go
@@ -310,7 +310,7 @@ func (r *renderer) persistToDisk(ctx context.Context, out filer.Filer) error {
 		if err == nil {
 			return fmt.Errorf("failed to initialize template, one or more files already exist: %s", path)
 		}
-		if err != nil && !errors.Is(err, fs.ErrNotExist) {
+		if !errors.Is(err, fs.ErrNotExist) {
 			return fmt.Errorf("error while verifying file %s does not already exist: %w", path, err)
 		}
 	}