diff --git a/openair2/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac_internal.c b/openair2/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac_internal.c
index d866fe1c168f2954eb53783b35a8727cc7ef5047..9359616d24f79df092a23e8b013630a9c4dde8c2 100644
--- a/openair2/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac_internal.c
+++ b/openair2/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac_internal.c
@@ -383,6 +383,18 @@ Protocol__FlexPagingBufferReport * copy_paging_buffer_report(Protocol__FlexPagin
 
  error:
   /*TODO: free memory properly*/
+  if (copy){
+    if (p_info){
+      for (i = 0; i < copy->n_paging_info; i++){
+        if (p_info[i]){
+          free(p_info[i]);
+        }
+      }
+      free(p_info);
+    }
+    free(copy);
+    copy = NULL;
+  }
   return NULL;
 }