deadlock fix + more exceptions processed (usable again)