Anya - Add unexpected exception support