diff --git a/vehicle/bmw/identity.go b/vehicle/bmw/identity.go
index f4b4af1ec..1d6145547 100644
--- a/vehicle/bmw/identity.go
+++ b/vehicle/bmw/identity.go
@@ -24,8 +24,8 @@ const (
 type Identity struct {
 	*request.Helper
 	region Region
-	log *util.Logger
-	user string
+	log    *util.Logger
+	user   string
 }
 
 // NewIdentity creates BMW identity
@@ -33,7 +33,7 @@ func NewIdentity(log *util.Logger, region string) *Identity {
 	v := &Identity{
 		Helper: request.NewHelper(log),
 		region: regions[strings.ToUpper(region)],
-		log: log,
+		log:    log,
 	}
 
 	return v
@@ -81,7 +81,7 @@ func (v *Identity) Login(user, password, hcaptcha string) (oauth2.TokenSource, e
 
 	uri := fmt.Sprintf("%s/oauth/authenticate", v.region.AuthURI)
 	headers := map[string]string{
-		"Content-Type": "application/x-www-form-urlencoded",
+		"Content-Type":  "application/x-www-form-urlencoded",
 		"hcaptchatoken": hcaptcha,
 	}
 	req, err := request.New(http.MethodPost, uri, strings.NewReader(data.Encode()), headers)
@@ -165,6 +165,9 @@ func (v *Identity) retrieveToken(data url.Values) (*oauth2.Token, error) {
 	var tok oauth2.Token
 	if err == nil {
 		err = v.DoJSON(req, &tok)
+		if err != nil {
+			return nil, err
+		}
 	} else {
 		return nil, err
 	}