Removed unnecessary exception throwing