Merge pull request #1719 from smowton/smowton/cleanup/remove_exceptions_single_global

Remove exceptions: switch to single inflight exception global

Author: smowton