fix: better handler InterruptedException