Removed exception throwing