Add more errors handlers