Avoid superfluous calls to NotifyOnStop
Merge pull request #1 from ampleyfly/master

Avoid superfluous calls to NotifyOnStop