Properly handle handler registering and unregistering
am: a715f7b8a2

* commit 'a715f7b8a211b5c4b74206539e9aa7ddacf4b243':
  Properly handle handler registering and unregistering