diff --git a/core/store/dist/src/main/java/org/onosproject/store/ecmap/EventuallyConsistentMapImpl.java b/core/store/dist/src/main/java/org/onosproject/store/ecmap/EventuallyConsistentMapImpl.java
index 23e2e5f..18cb3bc 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/ecmap/EventuallyConsistentMapImpl.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/ecmap/EventuallyConsistentMapImpl.java
@@ -353,6 +353,9 @@
             if (value.isPresent() && existing != null && existing.isAlive()) {
                 valueMatches = Objects.equals(value.get(), existing.get());
             }
+            if (existing == null) {
+                log.debug("ECMap Remove: Existing value for key {} is already null", k);
+            }
             updated.set(valueMatches && (existing == null || tombstone.isNewerThan(existing)));
             if (updated.get()) {
                 previousValue.set(existing);
diff --git a/core/store/dist/src/main/java/org/onosproject/store/intent/impl/GossipIntentStore.java b/core/store/dist/src/main/java/org/onosproject/store/intent/impl/GossipIntentStore.java
index 310d366..3d5a5d4 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/intent/impl/GossipIntentStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/intent/impl/GossipIntentStore.java
@@ -194,8 +194,8 @@
         NodeId master = partitionService.getLeader(key);
         NodeId origin = (data != null) ? data.origin() : null;
         if (master == null || origin == null) {
-            log.warn("Intent {} has no home; master = {}, origin = {}",
-                     key, master, origin);
+            log.debug("Intent {} missing master and/or origin; master = {}, origin = {}",
+                      key, master, origin);
         }
 
         NodeId me = clusterService.getLocalNode().id();
@@ -208,7 +208,7 @@
         } else if (isOrigin) {
             return master != null ? ImmutableList.of(master) : getRandomNode();
         } else {
-            log.warn("Not master or origin for intent {}", key);
+            log.warn("No master or origin for intent {}", key);
             return master != null ? ImmutableList.of(master) : getRandomNode();
         }
     }