am ae5708db: am c4aee98a: Improve error handling in listener services.

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