Small exception throwing adjustments