Merge pull request #1036 from Aflynn50/bugfix-NoneType-master

#1036

#### Description
Merge up #1035

Author: jujubot

.gitignore

@@ -15,3 +15,4 @@ pytestdebug.log
 .vscode/
 deb_dist
 *.tar.gz
+.idea/

juju/controller.py

@@ -854,7 +854,8 @@ async def _watcher(stop_event):
                     try:
                         results = await utils.run_with_interrupt(
                             watcher.Next(),
-                            stop_event)
+                            stop_event,
+                            log=log)
                     except JujuAPIError as e:
                         if 'watcher was stopped' not in str(e):
                             raise

juju/model.py

@@ -1204,7 +1204,8 @@ async def _all_watcher():
                     try:
                         results = await utils.run_with_interrupt(
                             allwatcher.Next(),
-                            self._watch_stopping)
+                            self._watch_stopping,
+                            log=log)
                     except JujuAPIError as e:
                         if 'watcher was stopped' not in str(e):
                             raise