Add support for for error handling, and associated tests

[Deleted user]