Move exception finalisation later in the shutdown process - this
fixes the crash seen in bug #1165761
2 files changed