Fixed race conditions in the self catch thing.
6 files changed