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

* commit '5788f2ba9b634ecc35a861d53b086bee1384d0b0':
  Improve error handling in listener services.