Simplify error handler