am acace94c: Fix race condition by guarding callbacks

* commit 'acace94c1739b08ea72dc6c2f49cf29bce6c1dac':
  Fix race condition by guarding callbacks