Change trade error handler to be less invasive