Add support for exceptions