diff --git a/archaius-etcd/src/main/java/com/netflix/config/source/EtcdConfigurationSource.java b/archaius-etcd/src/main/java/com/netflix/config/source/EtcdConfigurationSource.java
index de1f51540..4cdb7aaa2 100644
--- a/archaius-etcd/src/main/java/com/netflix/config/source/EtcdConfigurationSource.java
+++ b/archaius-etcd/src/main/java/com/netflix/config/source/EtcdConfigurationSource.java
@@ -68,6 +68,10 @@ private void init() {
     }
 
     private void cacheValues(Node configNode) {
+        if(configNode == null || configNode.getNodes() == null) {
+            return;
+        }
+
         for (Node valueNode : configNode.getNodes()) {
             final String etcdKey = valueNode.key();
             final String sourceKey = Iterables.getLast(keySplitter.split(etcdKey));