Fix CS
Add ThreadNotFoundException
Fix CS