added error.wrapper support