more support for exceptions added