diff --git a/request.go b/request.go
index 72a66f6..b627810 100644
--- a/request.go
+++ b/request.go
@@ -6,7 +6,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net"
 	"net/http"
 	"runtime"
@@ -197,6 +197,9 @@ func (r *gsRequest) retryHTTPRequest(ctx context.Context, cfg *Config) (string,
 	var responseBodyBytes []byte
 	err := retryNTimes(func() (bool, error) {
 		httpReq, err := r.prepareHTTPRequest(ctx, cfg)
+		if err != nil {
+			return false, err
+		}
 		logger.Debugf("Request body: %v", httpReq.Body)
 		logger.Debugf("Request headers: %v", maskHeaderCred(httpReq.Header))
 		resp, err := cfg.httpClient.Do(httpReq)
@@ -221,7 +224,7 @@ func (r *gsRequest) retryHTTPRequest(ctx context.Context, cfg *Config) (string,
 
 		statusCode := resp.StatusCode
 		requestUUID = resp.Header.Get(requestUUIDHeader)
-		responseBodyBytes, err = ioutil.ReadAll(resp.Body)
+		responseBodyBytes, err = io.ReadAll(resp.Body)
 		if err != nil {
 			logger.Errorf("Error while reading the response's body: %v", err)
 			return false, err