add support for more errors