Error handler is now called even if there is no error