Exception handler support added.