Fix up unthrown Exceptions - for Junit3 test methods, not point throwing anything other than Exception