Improve Block listen aborting