Adding support for exceptions.