diff --git a/openair2/ENB_APP/MESSAGES/V2/flexran.proto b/openair2/ENB_APP/MESSAGES/V2/flexran.proto
index 411f0196cb..7fd19c805c 100644
--- a/openair2/ENB_APP/MESSAGES/V2/flexran.proto
+++ b/openair2/ENB_APP/MESSAGES/V2/flexran.proto
@@ -7,6 +7,7 @@ import "time_common.proto";
 import "config_messages.proto";
 import "controller_commands.proto";
 import "config_common.proto";
+import "control_delegation.proto";
 
 message flexran_message {
        optional flexran_direction msg_dir = 100;
@@ -32,6 +33,7 @@ message flexran_message {
 	      flex_ul_mac_config ul_mac_config_msg = 19;
               flex_disconnect disconnect_msg = 20;
               flex_ho_command ho_command_msg = 21;
+              flex_control_delegation_request control_del_req_msg = 22;
 	}
 }
 
@@ -230,6 +232,12 @@ message flex_control_delegation {
 	optional string name = 4;		// The delegated functions names ordered based on bitmap flags
 }
 
+message flex_control_delegation_request {
+  optional flex_header header = 1;
+  optional flex_control_delegation_type delegation_type = 2;
+  optional string name = 4;
+}
+
 //
 // Agent reconfiguration message
 //
diff --git a/openair2/ENB_APP/flexran_agent_common.c b/openair2/ENB_APP/flexran_agent_common.c
index e1df8a543e..fa505c5415 100644
--- a/openair2/ENB_APP/flexran_agent_common.c
+++ b/openair2/ENB_APP/flexran_agent_common.c
@@ -464,12 +464,12 @@ int flexran_agent_control_delegation(mid_t mod_id, const void *params, Protocol_
       LOG_I(FLEXRAN_AGENT, "wrote shared object %s\n", target);
     } else {
       if (errno == EEXIST) {
-        LOG_I(FLEXRAN_AGENT, "file %s already exists, remove it first\n", target);
+        LOG_W(FLEXRAN_AGENT, "file %s already exists, remove it first\n", target);
       } else {
         LOG_E(FLEXRAN_AGENT, "can not write control delegation data to %s: %s\n",
               target, strerror(errno));
-        return 0;
       }
+      return 0;
     }
   } else {
     LOG_W(FLEXRAN_AGENT, "remove file %s\n", target);