I think, you can adopt my suggestion to not use redundant "raise" clauses.