diff --git a/core/net/src/main/java/org/onosproject/net/intent/impl/IntentManager.java b/core/net/src/main/java/org/onosproject/net/intent/impl/IntentManager.java
index 7b79f95..353af4d 100644
--- a/core/net/src/main/java/org/onosproject/net/intent/impl/IntentManager.java
+++ b/core/net/src/main/java/org/onosproject/net/intent/impl/IntentManager.java
@@ -384,7 +384,10 @@
                 // related resources.
                 Long remainingIntents =
                         Tools.stream(store.getIntents())
-                             .filter(i -> i.resourceGroup().equals(intent.resourceGroup()))
+                             .filter(i -> {
+                                 return i.resourceGroup() != null
+                                     && i.resourceGroup().equals(intent.resourceGroup());
+                             })
                              .count();
                 if (remainingIntents == 0) {
                     removeResource = true;