diff --git a/pkg/util/util.go b/pkg/util/util.go
index ed3f736..08e57e5 100644
--- a/pkg/util/util.go
+++ b/pkg/util/util.go
@@ -18,7 +18,7 @@ func RetryExponentialAttempts(attempts int, sleep time.Duration, f func() error)
 	for i := 0; i < attempts; i++ {
 		err = f()
 		if err == nil {
-			return
+			return nil
 		} else {
 			log.WithField("count", i).WithError(err).Debug("retrying after error")
 			time.Sleep(sleep)
diff --git a/tests/helpers/test_helpers.go b/tests/helpers/test_helpers.go
index a6aa370..9b767b1 100644
--- a/tests/helpers/test_helpers.go
+++ b/tests/helpers/test_helpers.go
@@ -70,7 +70,7 @@ func ReceiveAllWebSocketMessages(connection *websocket.Conn) (messages []*dto.We
 		var message *dto.WebSocketMessage
 		message, err = ReceiveNextWebSocketMessage(connection)
 		if err != nil {
-			return
+			return messages, err
 		}
 		messages = append(messages, message)
 	}
@@ -175,7 +175,7 @@ func HTTPPut(url string, body io.Reader) (response *http.Response, err error) {
 func HTTPPutJSON(url string, body interface{}) (response *http.Response, err error) {
 	requestByteString, err := json.Marshal(body)
 	if err != nil {
-		return
+		return nil, fmt.Errorf("cannot marshal json http body: %w", err)
 	}
 	reader := bytes.NewReader(requestByteString)
 	return HTTPPut(url, reader)