OAuth2Client removed and Exception moved