fixed no handlers found + cleanup