diff --git a/VERSION b/VERSION
index 1c1ea95..be14458 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.3.15_dev
+2.3.15
diff --git a/pyvoltha/adapters/extensions/omci/state_machines/performance_intervals.py b/pyvoltha/adapters/extensions/omci/state_machines/performance_intervals.py
index 81c11d0..356af3b 100644
--- a/pyvoltha/adapters/extensions/omci/state_machines/performance_intervals.py
+++ b/pyvoltha/adapters/extensions/omci/state_machines/performance_intervals.py
@@ -859,8 +859,13 @@
 
             # Is this associated with the ANI or the UNI side of the bridge?
             # For VOLTHA v2.0, only high-speed internet data service is
-            attributes = request.fields['omci_message'].fields['data']
-            pm_class_ids, upstream = tp_type_to_pm(attributes['tp_type'])
+            if "data" in request.fields['omci_message'].fields:
+                attributes = request.fields['omci_message'].fields['data']
+                pm_class_ids, upstream = tp_type_to_pm(attributes['tp_type'])
+            else:
+                attributes = None
+                pm_class_ids = None
+                upstream = None
             cid = request.fields['omci_message'].fields['entity_class']
             eid = request.fields['omci_message'].fields['entity_id']
             if not add: