diff --git a/letsencrypt/le_util.py b/letsencrypt/le_util.py
index 64295a80f..3eb4be0a7 100644
--- a/letsencrypt/le_util.py
+++ b/letsencrypt/le_util.py
@@ -317,4 +317,4 @@ def check_domain_sanity(domain):
     #  first and last char is not "-"
     fqdn = re.compile("^((?!-)[A-Za-z0-9-]{1,63}(?<!-)\\.)+[A-Za-z]{2,63}$")
     if not fqdn.match(domain):
-        raise errors.ConfigurationError("Requested domain is not a FQDN")
+        raise errors.ConfigurationError("Requested domain {0} is not a FQDN".format(domain))
diff --git a/letsencrypt/tests/cli_test.py b/letsencrypt/tests/cli_test.py
index acb6e97c2..ee135825d 100644
--- a/letsencrypt/tests/cli_test.py
+++ b/letsencrypt/tests/cli_test.py
@@ -1,6 +1,5 @@
 """Tests for letsencrypt.cli."""
 import argparse
-import copy
 import itertools
 import os
 import shutil