diff --git a/src/cli/plug/__init__.py b/src/cli/plug/__init__.py
index 39b6eed56..1e5b4fefd 100644
--- a/src/cli/plug/__init__.py
+++ b/src/cli/plug/__init__.py
@@ -500,6 +500,7 @@ class CommandLineReport(object):
             print "   Available options:"
             for key in sorted(self.options_dict.keys()):
                 if key in self.options_help:
+                    if key is None: continue
                     opt = self.options_help[key]
                 # Make the output nicer to read, assume that tab has 8 spaces
                     tabs = '\t\t' if len(key) < 10 else '\t'
diff --git a/src/plugins/drawreport/drawplugins.gpr.py b/src/plugins/drawreport/drawplugins.gpr.py
index 2b7ffcf3c..0d6350a21 100644
--- a/src/plugins/drawreport/drawplugins.gpr.py
+++ b/src/plugins/drawreport/drawplugins.gpr.py
@@ -37,7 +37,7 @@ plg.status = STABLE
 plg.fname = 'AncestorTree.py'
 plg.ptype = REPORT
 plg.authors = ["Craig J. Anderson"]
-plg.authors_email = ["ander882@gramps-project.org"]
+plg.authors_email = ["ander882@hotmail.com"]
 plg.category = CATEGORY_DRAW
 plg.reportclass = 'AncestorTree'
 plg.optionclass = 'AncestorTreeOptions'
@@ -53,7 +53,7 @@ plg.status = STABLE
 plg.fname = 'AncestorTree.py'
 plg.ptype = REPORT
 plg.authors = ["Craig J. Anderson"]
-plg.authors_email = ["ander882@gramps-project.org"]
+plg.authors_email = ["ander882@hotmail.com"]
 plg.category = CATEGORY_DRAW
 plg.reportclass = 'AncestorTree'
 plg.optionclass = 'AncestorTreeOptions'
@@ -97,7 +97,7 @@ plg.status = STABLE
 plg.fname = 'DescendTree.py'
 plg.ptype = REPORT
 plg.authors = ["Craig J. Anderson"]
-plg.authors_email = ["ander882@gramps-project.org"]
+plg.authors_email = ["ander882@hotmail.com"]
 plg.category = CATEGORY_DRAW
 plg.reportclass = 'DescendTree'
 plg.optionclass = 'DescendTreeOptions'
@@ -113,7 +113,7 @@ plg.status = STABLE
 plg.fname = 'DescendTree.py'
 plg.ptype = REPORT
 plg.authors = ["Craig J. Anderson"]
-plg.authors_email = ["ander882@gramps-project.org"]
+plg.authors_email = ["ander882@hotmail.com"]
 plg.category = CATEGORY_DRAW
 plg.reportclass = 'DescendTree'
 plg.optionclass = 'DescendTreeOptions'
@@ -136,7 +136,7 @@ plg.ptype = REPORT
 plg.category = CATEGORY_DRAW
 plg.gramps_target_version = '3.4'
 plg.authors = ["Craig J. Anderson"]
-plg.authors_email = ["ander882@gramps-project.org"]
+plg.authors_email = ["ander882@hotmail.com"]
 plg.require_active = True
 plg.reportclass = 'DescendTree'
 plg.optionclass = 'DescendTreeOptions'
@@ -153,7 +153,7 @@ plg.ptype = REPORT
 plg.category = CATEGORY_DRAW
 plg.gramps_target_version = '3.4'
 plg.authors = ["Craig J. Anderson"]
-plg.authors_email = ["ander882@gramps-project.org"]
+plg.authors_email = ["ander882@hotmail.com"]
 plg.require_active = True
 plg.reportclass = 'DescendTree'
 plg.optionclass = 'DescendTreeOptions'