diff --git a/internal/streamrpc/client.go b/internal/streamrpc/client.go
index b26d43f33835680bc63a4f2d81e3a3ded96a1778..b5ee279161b141556b02e126067c84934e08f6f3 100644
--- a/internal/streamrpc/client.go
+++ b/internal/streamrpc/client.go
@@ -22,23 +22,23 @@ func doCall(dial DialFunc, request []byte, callback func(net.Conn) error) error
 
 	c, err := dial(time.Until(deadline))
 	if err != nil {
-		return fmt.Errorf("dial: %w", err)
+		return fmt.Errorf("streamrpc: call: dial: %w", err)
 	}
 	defer c.Close()
 
 	if err := sendFrame(c, request, deadline); err != nil {
-		return fmt.Errorf("send request: %w", err)
+		return fmt.Errorf("streamrpc: send handshake: %w", err)
 	}
 
 	responseBytes, err := recvFrame(c, deadline)
 	if err != nil {
-		return fmt.Errorf("receive response: %w", err)
+		return fmt.Errorf("streamrpc: receive handshake: %w", err)
 	}
 
 	if len(responseBytes) > 0 {
 		var resp response
 		if err := json.Unmarshal(responseBytes, &resp); err != nil {
-			return fmt.Errorf("unmarshal response: %w", err)
+			return fmt.Errorf("streamrpc: unmarshal handshake response: %w", err)
 		}
 
 		return &RequestRejectedError{resp.Error}