Clean up exception throwing