KAZOO-2559: eavesdrop's fixes & code feature

Why single this clause out instead of letting the next clause catch this case?