Check for null watcher and not to add a rewatchWatch if it is null.
Merge pull request #74 from continuuity/feature/fix-rewatch-watcher-leak

Check for null watcher and not to add a rewatchWatch if it is null.