Refactored: removed unnecessary exception wrapping