Make exception throwing more transparent