Own error handler fix