From dcf8ea4e97e63fafe0e9ddf75ca6e72a69a0b040 Mon Sep 17 00:00:00 2001
From: Peter Eckersley <pde@eff.org>
Date: Fri, 16 Oct 2015 17:38:17 -0700
Subject: [PATCH] Logic for setting configurators assumed they were really
 being set

(They might not be)
---
 letsencrypt/cli.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/letsencrypt/cli.py b/letsencrypt/cli.py
index f8675b3b4..77480f69f 100644
--- a/letsencrypt/cli.py
+++ b/letsencrypt/cli.py
@@ -309,6 +309,9 @@ class ConfiguratorError(TypeError): # pylint: disable=missing-docstring
 
 def set_configurator(previously, now):
     """Setting configurators multiple ways is okay, as long as they all agree"""
+    if now is None:
+        # we're not actually setting anything
+        return previously
     if previously:
         if previously != now:
             msg = "Too many flags setting configurators/installers/authenticators %s -> %s"