fix a memory corruption where a SF Client could be used after it's been destroyed
12 files changed