Fixed another thread hang

Handling methods were getting bad params, some threads not closing
properly as a result