Fixed reraise_as statements which needlessly changed error type