- yaz_query_charset_convert_structure(q->u.complex->s1, o, wrbuf, cd);
- yaz_query_charset_convert_structure(q->u.complex->s2, o, wrbuf, cd);
+ r = yaz_query_charset_convert_structure(q->u.complex->s1, o, wrbuf, cd);
+ if (r == 0)
+ r = yaz_query_charset_convert_structure(
+ q->u.complex->s2, o, wrbuf, cd);