diff --git a/certbot-nginx/certbot_nginx/nginxparser.py b/certbot-nginx/certbot_nginx/nginxparser.py
index d7248ad49..1664f94cf 100644
--- a/certbot-nginx/certbot_nginx/nginxparser.py
+++ b/certbot-nginx/certbot_nginx/nginxparser.py
@@ -1,5 +1,6 @@
 """Very low-level nginx config parser based on pyparsing."""
 import copy
+import logging
 import string
 
 from pyparsing import (
@@ -8,6 +9,7 @@ from pyparsing import (
 from pyparsing import stringEnd
 from pyparsing import restOfLine
 
+logger = logging.getLogger(__name__)
 
 class RawNginxParser(object):
     # pylint: disable=expression-not-assigned
@@ -97,11 +99,7 @@ class RawNginxDumper(object):
                     # if so rotate it into gap
                     if values and spacey(values):
                         gap = values
-                        try:
-                            values = b.pop(0)
-                        except:
-                            import ipdb
-                            ipdb.set_trace()
+                        values = b.pop(0)
                     #if values is None:
                     #    yield indentation + key + gap + ';'
                     #else:
@@ -200,7 +198,7 @@ class UnspacedList(list):
             self.spaced.extend(x.spaced)
         else:
             self.spaced.extend(x)
-            self.logger.debug("Weird, extending regular list %r to Unspaced %r", x, self)
+            logger.debug("Weird, extending regular list %r to Unspaced %r", x, self)
         list.extend(self, x)
 
     def __add__(self, other):
diff --git a/certbot-nginx/certbot_nginx/parser.py b/certbot-nginx/certbot_nginx/parser.py
index 61c719816..21127bc08 100644
--- a/certbot-nginx/certbot_nginx/parser.py
+++ b/certbot-nginx/certbot_nginx/parser.py
@@ -4,7 +4,6 @@ import logging
 import os
 import pyparsing
 import re
-import sys
 
 from certbot import errors
 
diff --git a/certbot-nginx/certbot_nginx/tests/nginxparser_test.py b/certbot-nginx/certbot_nginx/tests/nginxparser_test.py
index 87c7a0430..7354c118c 100644
--- a/certbot-nginx/certbot_nginx/tests/nginxparser_test.py
+++ b/certbot-nginx/certbot_nginx/tests/nginxparser_test.py
@@ -1,5 +1,6 @@
 """Test for certbot_nginx.nginxparser."""
 import operator
+import os
 import unittest
 
 from pyparsing import ParseException
diff --git a/certbot-nginx/certbot_nginx/tls_sni_01.py b/certbot-nginx/certbot_nginx/tls_sni_01.py
index 13ae2c358..e4c5d31a6 100644
--- a/certbot-nginx/certbot_nginx/tls_sni_01.py
+++ b/certbot-nginx/certbot_nginx/tls_sni_01.py
@@ -3,7 +3,6 @@
 import itertools
 import logging
 import os
-import sys
 
 from certbot import errors
 from certbot.plugins import common
@@ -124,8 +123,7 @@ class NginxTlsSni01(common.TLSSNI01):
             True, self.challenge_conf)
 
         with open(self.challenge_conf, "w") as new_conf:
-            out = nginxparser.dumps(config)
-            new_conf.write(out)
+            nginxparser.dump(config, new_conf)
 
     def _make_server_block(self, achall, addrs):
         """Creates a server block for a challenge.