- Fix error handler