Replaced deliberate exception throwing with proper flow control