Also if tidying up, I don't see the point in catching these exceptions. We should just throw (and not unwrap anything), so that the full context of what failed gets output by testng. Unwrapping an ExecutionException often just means we just lose the line number in this thread, so is often a bad idea.

But that comment is nothing to do with this pull request!