Remove redundant except/re-raise