diff --git a/core/store/dist/src/main/java/org/onosproject/store/newresource/impl/ConsistentResourceStore.java b/core/store/dist/src/main/java/org/onosproject/store/newresource/impl/ConsistentResourceStore.java
index 2ab2611..b8541ee 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/newresource/impl/ConsistentResourceStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/newresource/impl/ConsistentResourceStore.java
@@ -214,10 +214,13 @@
                 }
             });
             if (allocated) {
+                log.warn("Failed to unregister {}: allocation exists", entry.getKey());
                 return abortTransaction(tx);
             }
 
             if (!removeValues(childTxMap, entry.getKey(), entry.getValue())) {
+                log.warn("Failed to unregister {}: Failed to remove values: {}",
+                         entry.getKey(), entry.getValue());
                 return abortTransaction(tx);
             }
         }
@@ -229,6 +232,8 @@
                     .map(x -> new ResourceEvent(RESOURCE_REMOVED, x))
                     .collect(Collectors.toList());
             notifyDelegate(events);
+        } else {
+            log.warn("Failed to unregister {}: Commit failed.", resources);
         }
         return success;
     }
