Removed thread checker more and added error catch again