Fixing a bug with optimized catch-all handlers in WinEHPrepare