diff --git a/pkg/op/client.go b/pkg/op/client.go
index e0a0443..913944c 100644
--- a/pkg/op/client.go
+++ b/pkg/op/client.go
@@ -153,15 +153,15 @@ type clientData struct {
 // If no client id can be obtained by any method, oidc.ErrInvalidClient
 // is returned with ErrMissingClientID wrapped in it.
 func ClientIDFromRequest(r *http.Request, p ClientProvider) (clientID string, authenticated bool, err error) {
-	ctx, span := tracer.Start(r.Context(), "ClientIDFromRequest")
-	r = r.WithContext(ctx)
-	defer span.End()
-
 	err = r.ParseForm()
 	if err != nil {
 		return "", false, oidc.ErrInvalidRequest().WithDescription("cannot parse form").WithParent(err)
 	}
 
+	ctx, span := tracer.Start(r.Context(), "ClientIDFromRequest")
+	r = r.WithContext(ctx)
+	defer span.End()
+
 	data := new(clientData)
 	if err = p.Decoder().Decode(data, r.Form); err != nil {
 		return "", false, err
diff --git a/pkg/op/op_test.go b/pkg/op/op_test.go
index 5e0d675..83032d4 100644
--- a/pkg/op/op_test.go
+++ b/pkg/op/op_test.go
@@ -181,7 +181,7 @@ func TestRoutes(t *testing.T) {
 			},
 		},
 		{
-			// This call will fail. A successfull test is already
+			// This call will fail. A successful test is already
 			// part of client/integration_test.go
 			name:   "code exchange",
 			method: http.MethodGet,