diff --git a/octodns/cmds/compare.py b/octodns/cmds/compare.py
index 7df23fd..4123643 100755
--- a/octodns/cmds/compare.py
+++ b/octodns/cmds/compare.py
@@ -29,3 +29,7 @@ def main():
     manager = Manager(args.config_file)
     changes = manager.compare(args.a, args.b, args.zone)
     pprint(changes)
+
+
+if __name__ == '__main__':
+    main()
diff --git a/octodns/cmds/dump.py b/octodns/cmds/dump.py
index bf8ff9d..e4c4987 100755
--- a/octodns/cmds/dump.py
+++ b/octodns/cmds/dump.py
@@ -26,3 +26,7 @@ def main():
 
     manager = Manager(args.config_file)
     manager.dump(args.zone, args.output_dir, *args.source)
+
+
+if __name__ == '__main__':
+    main()
diff --git a/octodns/cmds/report.py b/octodns/cmds/report.py
index 52402fa..06a4484 100755
--- a/octodns/cmds/report.py
+++ b/octodns/cmds/report.py
@@ -98,3 +98,7 @@ def main():
             answers = '*:*'.join(sorted(answers)).lower()
             compare[answers] = True
         stdout.write(',True\n' if len(compare) == 1 else ',False\n')
+
+
+if __name__ == '__main__':
+    main()
diff --git a/octodns/cmds/sync.py b/octodns/cmds/sync.py
index 8188a37..4dd3e87 100755
--- a/octodns/cmds/sync.py
+++ b/octodns/cmds/sync.py
@@ -37,3 +37,7 @@ def main():
     manager = Manager(args.config_file)
     manager.sync(eligible_zones=args.zone, eligible_targets=args.target,
                  dry_run=not args.doit, force=args.force)
+
+
+if __name__ == '__main__':
+    main()
diff --git a/octodns/cmds/validate.py b/octodns/cmds/validate.py
index 692576b..85c3018 100755
--- a/octodns/cmds/validate.py
+++ b/octodns/cmds/validate.py
@@ -22,3 +22,7 @@ def main():
 
     manager = Manager(args.config_file)
     manager.validate_configs()
+
+
+if __name__ == '__main__':
+    main()
diff --git a/octodns/manager.py b/octodns/manager.py
index 8d8569a..2545e71 100644
--- a/octodns/manager.py
+++ b/octodns/manager.py
@@ -51,6 +51,7 @@ class MainThreadExecutor(object):
         try:
             future.set_result(func(*args, **kwargs))
         except Exception as e:
+            # TODO: get right stacktrace here
             future.set_exception(e)
         return future