Process toward bug 186.
[Fixes 186] Listeners were being destroyed when they shouldn't have been on creation of a new datastore