am 1182a111: am 5788f2ba: am ae5708db: am c4aee98a: Improve error handling in listener services.

* commit '1182a111ece20707da9b689ada28af190a2ee41a':
  Improve error handling in listener services.