diff --git a/cli/src/main/java/org/onosproject/cli/net/IntentsListCommand.java b/cli/src/main/java/org/onosproject/cli/net/IntentsListCommand.java
index 59473ca..77a8bd6 100644
--- a/cli/src/main/java/org/onosproject/cli/net/IntentsListCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/IntentsListCommand.java
@@ -328,7 +328,7 @@
     }
 
     private void printDetails(IntentService service, Intent intent) {
-        if (intent.resources() != null && !intent.resources().isEmpty()) {
+        if (!intent.resources().isEmpty()) {
             print("    resources=%s", intent.resources());
         }
         if (intent instanceof ConnectivityIntent) {
@@ -392,7 +392,7 @@
             result.put("state", state.toString());
         }
 
-        if (intent.resources() != null && !intent.resources().isEmpty()) {
+        if (!intent.resources().isEmpty()) {
             ArrayNode rnode = mapper.createArrayNode();
             for (NetworkResource resource : intent.resources()) {
                 rnode.add(resource.toString());
