Slightly orginize exception passing