add @ExpectThrows annotation and hack in some support for it