Refactored away unused exception