diff --git a/.golangci.yml b/.golangci.yml
index 7d631ed2415a027b813198a434b5cce18ab4aad3..d54dcb183f9153fe09cda69d83b01ed73eb7ded3 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -1,28 +1,27 @@
 run:
     timeout: 4m
-    skip-dirs:
-        - storage/ent/db # generated ent code
 
 linters-settings:
     depguard:
-      rules:
-        deprecated:
-          deny:
-            - pkg: "io/ioutil"
-              desc: "The 'io/ioutil' package is deprecated. Use corresponding 'os' or 'io' functions instead."
+        rules:
+            deprecated:
+                deny:
+                    - pkg: "io/ioutil"
+                      desc: "The 'io/ioutil' package is deprecated. Use corresponding 'os' or 'io' functions instead."
     gci:
-        local-prefixes: github.com/dexidp/dex
+        sections:
+            - standard
+            - default
+            - prefix(github.com/dexidp/dex)
     goimports:
         local-prefixes: github.com/dexidp/dex
 
-
 linters:
     disable-all: true
     enable:
         - depguard
         - dogsled
         - exhaustive
-        - exportloopref
         - gci
         - gochecknoinits
         - gocritic
@@ -92,3 +91,7 @@ linters:
         # - nestif
         # - testpackage
         # - wsl
+
+issues:
+    exclude-dirs:
+        - storage/ent/db # generated ent code
diff --git a/connector/saml/saml.go b/connector/saml/saml.go
index bc8ef726ce4f27e1e55476472b7f10d293281aa9..3e44b477e37892c2b91ad11e355895bcdaffed20 100644
--- a/connector/saml/saml.go
+++ b/connector/saml/saml.go
@@ -467,7 +467,7 @@ func (p *provider) validateStatus(status *status) error {
 		if statusMessage != nil && statusMessage.Value != "" {
 			errorMessage += " -> " + statusMessage.Value
 		}
-		return fmt.Errorf(errorMessage)
+		return errors.New(errorMessage)
 	}
 	return nil
 }
diff --git a/server/introspectionhandler.go b/server/introspectionhandler.go
index ffcbb13679762cf1b69fd9bdca8264c32b18c931..802e29b6e70947e15308a4fd4107669ced49a23d 100644
--- a/server/introspectionhandler.go
+++ b/server/introspectionhandler.go
@@ -170,7 +170,7 @@ func (s *Server) getTokenFromRequest(r *http.Request) (string, TokenTypeEnum, er
 		return "", 0, newIntrospectBadRequestError(fmt.Sprintf("HTTP method is \"%s\", expected \"POST\".", r.Method))
 	} else if err := r.ParseForm(); err != nil {
 		return "", 0, newIntrospectBadRequestError("Unable to parse HTTP body, make sure to send a properly formatted form request body.")
-	} else if r.PostForm == nil || len(r.PostForm) == 0 {
+	} else if len(r.PostForm) == 0 {
 		return "", 0, newIntrospectBadRequestError("The POST body can not be empty.")
 	} else if !r.PostForm.Has("token") {
 		return "", 0, newIntrospectBadRequestError("The POST body doesn't contain 'token' parameter.")