diff --git a/spring-cloud-zookeeper-config/src/main/java/org/springframework/cloud/zookeeper/config/ZookeeperConfigDataLoader.java b/spring-cloud-zookeeper-config/src/main/java/org/springframework/cloud/zookeeper/config/ZookeeperConfigDataLoader.java
index 416e234d..09d6f656 100644
--- a/spring-cloud-zookeeper-config/src/main/java/org/springframework/cloud/zookeeper/config/ZookeeperConfigDataLoader.java
+++ b/spring-cloud-zookeeper-config/src/main/java/org/springframework/cloud/zookeeper/config/ZookeeperConfigDataLoader.java
@@ -43,6 +43,10 @@ public class ZookeeperConfigDataLoader implements ConfigDataLoader<ZookeeperConf
 	public ConfigData load(ConfigDataLoaderContext context, ZookeeperConfigDataResource resource) {
 		try {
 			CuratorFramework curator = context.getBootstrapContext().get(CuratorFramework.class);
+			if (curator == null) {
+				// this can happen if certain conditions are met
+				return null;
+			}
 			ZookeeperPropertySource propertySource = new ZookeeperPropertySource(resource.getContext(),
 					curator);
 			List<ZookeeperPropertySource> propertySources = Collections.singletonList(propertySource);
@@ -70,7 +74,7 @@ public class ZookeeperConfigDataLoader implements ConfigDataLoader<ZookeeperConf
 		}
 		catch (Exception e) {
 			if (log.isDebugEnabled()) {
-				log.debug("Error getting properties from consul: " + resource, e);
+				log.debug("Error getting properties from zookeeper: " + resource, e);
 			}
 			throw new ConfigDataResourceNotFoundException(resource, e);
 		}
diff --git a/spring-cloud-zookeeper-core/src/main/java/org/springframework/cloud/zookeeper/CuratorFactory.java b/spring-cloud-zookeeper-core/src/main/java/org/springframework/cloud/zookeeper/CuratorFactory.java
index 026ad7e5..41b19064 100644
--- a/spring-cloud-zookeeper-core/src/main/java/org/springframework/cloud/zookeeper/CuratorFactory.java
+++ b/spring-cloud-zookeeper-core/src/main/java/org/springframework/cloud/zookeeper/CuratorFactory.java
@@ -117,8 +117,10 @@ public abstract class CuratorFactory {
 			BootstrapContext context = event.getBootstrapContext();
 			if (predicate.test(context)) {
 				CuratorFramework curatorFramework = context.get(CuratorFramework.class);
-				event.getApplicationContext().getBeanFactory().registerSingleton("configDataCuratorFramework",
-						curatorFramework);
+				if (!event.getApplicationContext().getBeanFactory().containsBean("configDataCuratorFramework")) {
+					event.getApplicationContext().getBeanFactory().registerSingleton("configDataCuratorFramework",
+							curatorFramework);
+				}
 			}
 		});