* Disallow dispose during listener callback

* addressing comment

* add comments to code

* Addressing comments

* fix test