Support struct call tip expansion and add error handler