* Simplify servlet error handler
* Update localization