Fix crashing when messaging is enabled.

After running a simulation with messaging enabled, the merging of threads can cause a SIGSEV or SIGBUS error; we need to clean things up and ensure we don't crash, even if all the important work is done by the time we crash