Change: Added verification before a new listener thread starts
Trivial: Use "break" statement where applicable