diff --git a/providers/openflow/message/src/main/java/org/onosproject/provider/of/message/impl/OpenFlowControlMessageProvider.java b/providers/openflow/message/src/main/java/org/onosproject/provider/of/message/impl/OpenFlowControlMessageProvider.java
index c9d0063..3f4b64d 100644
--- a/providers/openflow/message/src/main/java/org/onosproject/provider/of/message/impl/OpenFlowControlMessageProvider.java
+++ b/providers/openflow/message/src/main/java/org/onosproject/provider/of/message/impl/OpenFlowControlMessageProvider.java
@@ -209,7 +209,10 @@
             if (msg.getType() == OFType.PACKET_IN ||
                     msg.getType() == OFType.FLOW_MOD ||
                     msg.getType() == OFType.STATS_REPLY) {
-                aggregators.get(dpid).increment(msg);
+                aggregators.computeIfPresent(dpid, (k, v) -> {
+                    v.increment(msg);
+                    return v;
+                });
             }
         }
     }
@@ -221,7 +224,10 @@
 
         @Override
         public void handleMessage(Dpid dpid, OFMessage msg) {
-            aggregators.get(dpid).increment(msg);
+            aggregators.computeIfPresent(dpid, (k, v) -> {
+                v.increment(msg);
+                return v;
+            });
         }
     }
 }