* Improve error handler.