remove wrap_on_error for now, it's not yet ready