Revert adding generic except statements