Note this is an API code change (i don't think reraise is ever set to True so have removed the code) - but worth a review...