am f66eb70a: Don\'t crash when listener registration gets out of sync

* commit 'f66eb70a66bb194f4bef54fe74a04d6c9a3515de':
  Don't crash when listener registration gets out of sync