change container and error handler