[OOP] Another minor edit with exception throwing