+ added support for all errors