Add struct call tip expansion and error handler