am c4aee98a: Improve error handling in listener services.

* commit 'c4aee98a62f400dd9f6f964d26d739d409212775':
  Improve error handling in listener services.