Extended support for new exceptions