diff --git a/voltha/core/flow_decomposer.py b/voltha/core/flow_decomposer.py
index bb346d4..cdeb44a 100644
--- a/voltha/core/flow_decomposer.py
+++ b/voltha/core/flow_decomposer.py
@@ -597,7 +597,10 @@
                         ]
                     ))
 
-                    group = group_map[grp_id]
+                    # having no group yet is the same as having a group with
+                    # no buckets
+                    group = group_map.get(grp_id, ofp.ofp_group_entry())
+
                     for bucket in group.desc.buckets:
                         found_pop_vlan = False
                         other_actions = []