diff --git a/client/client.go b/client/client.go
index 82ff0583..323a19b0 100644
--- a/client/client.go
+++ b/client/client.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"encoding/json"
 	"errors"
+	"fmt"
 	"math/rand"
 	"time"
 
@@ -77,9 +78,9 @@ func (n *nexClient) GetNodeInfo(nodeId string) (*models.NodeInfoResponse, error)
 	resp, err := n.nc.Request(models.NodeInfoRequestSubject(n.namespace, nodeId), reqB, n.defaultTimeout)
 	if err != nil && !errors.Is(err, nats.ErrNoResponders) && !errors.Is(err, nats.ErrTimeout) {
 		return nil, err
-	}
-
-	if err != nil || len(resp.Data) == 0 {
+	} else if err != nil {
+		return nil, fmt.Errorf("failed to request node info: %w", err)
+	} else if len(resp.Data) == 0 {
 		return nil, errors.New("node not found")
 	}
 
diff --git a/client/client_test.go b/client/client_test.go
index e6a6cb94..ab0b16fb 100644
--- a/client/client_test.go
+++ b/client/client_test.go
@@ -184,22 +184,20 @@ func TestNexClient_SystemAsUser(t *testing.T) {
 	be.NilErr(t, err)
 	defer nc.Close()
 
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
+	ctx := t.Context()
 
 	nexNodes := _test.StartNexus(t, ctx, server.ClientURL(), 1, false)
 	be.Equal(t, 1, len(nexNodes))
 
-	client, err := NewClient(context.Background(), nc, "user")
+	client, err := NewClient(t.Context(), nc, "user")
 	be.NilErr(t, err)
 	be.Nonzero(t, client)
 
 	_, err = client.GetNodeInfo(_test.Node1Pub)
-	be.Equal(t, "node not found", err.Error())
+	be.Unequal(t, err, nil)
 
 	nodes, err := client.ListNodes(map[string]string{"foo": "bar"})
 	be.NilErr(t, err)
-	//	be.Equal(t, "no nodes found", err.Error())
 	be.Equal(t, 0, len(nodes))
 
 	ldresp, err := client.SetLameduck(_test.Node1Pub, 0, nil)