Prevent adding watchers after hangup
Merge pull request #1 from bbeeley/master

Prevent adding watchers after hangup.