diff --git a/vslib/vpp/SwitchVppRoute.cpp b/vslib/vpp/SwitchVppRoute.cpp
index c35c224d..544c2c9d 100644
--- a/vslib/vpp/SwitchVppRoute.cpp
+++ b/vslib/vpp/SwitchVppRoute.cpp
@@ -128,7 +128,12 @@ sai_status_t SwitchVpp::IpRouteAddRemove(
     }
 
     attr.id = SAI_ROUTE_ENTRY_ATTR_NEXT_HOP_ID;
-    CHECK_STATUS_QUIET(route_obj->get_mandatory_attr(attr));
+    status = route_obj->get_attr(attr);
+    if (status != SAI_STATUS_SUCCESS) {
+        SWSS_LOG_NOTICE("Ignoring ip route %s: no next hop id",
+                        serializedObjectId.c_str());
+        return SAI_STATUS_SUCCESS;
+    }
     next_hop_oid = attr.value.oid;
 
     sai_route_entry_t route_entry;
diff --git a/vslib/vpp/vppxlate/SaiVppXlate.c b/vslib/vpp/vppxlate/SaiVppXlate.c
index 474ede5a..6e856e45 100644
--- a/vslib/vpp/vppxlate/SaiVppXlate.c
+++ b/vslib/vpp/vppxlate/SaiVppXlate.c
@@ -24,6 +24,7 @@
 #include <vlibapi/api.h>
 #include <vlibmemory/api.h>
 #include <vppinfra/error.h>
+#include <vnet/api_errno.h>
 
 #include "SaiVppXlate.h"
 
@@ -332,6 +333,20 @@ void os_exit(int code) {}
 
 #include "../SaiVppLog.h"
 
+/*
+ * Normalize VPP return code for delete operations.
+ * If the operation is a delete and VPP returns NO_SUCH_ENTRY,
+ * the entry is already gone — treat it as success.
+ */
+static inline int vpp_normalize_ret(int ret, bool is_del, const char *func)
+{
+    if (is_del && ret == VNET_API_ERROR_NO_SUCH_ENTRY) {
+	    SAIVPP_INFO("%s: ignoring NO_SUCH_ENTRY(%d) on delete", func, ret);
+	    ret = 0;
+    }
+    return ret;
+}
+
 #define M22(T, mp, n)                                            \
 do {                                                            \
     socket_client_main_t *scm = vam->socket_client_main;	\
@@ -628,9 +643,6 @@ vl_api_want_interface_events_reply_t_handler (vl_api_want_interface_events_reply
 {
     int retval = (int)ntohl((uint32_t)msg->retval);
     set_reply_status(retval);
-
-    if (retval) { SAIVPP_ERROR("sw interface events enable failed(%d)", retval); }
-    else { SAIVPP_INFO("sw interface events enable successful"); }
 }
 
 static void
@@ -739,9 +751,6 @@ vl_api_create_subif_reply_t_handler (vl_api_create_subif_reply_t *msg)
 {
     int retval = (int)ntohl((uint32_t)msg->retval);
     set_reply_status(retval);
-
-    if (retval) { SAIVPP_ERROR("subinterface creation failed(%d)", retval); }
-    else { SAIVPP_INFO("subinterface creation successful"); }
 }
 
 static void
@@ -749,9 +758,6 @@ vl_api_delete_subif_reply_t_handler (vl_api_delete_subif_reply_t *msg)
 {
     int retval = (int)ntohl((uint32_t)msg->retval);
     set_reply_status(retval);
-
-    if (retval) { SAIVPP_ERROR("subinterface deletion failed(%d)", retval); }
-    else { SAIVPP_INFO("subinterface deletion successful"); }
 }
 
 static void
@@ -759,9 +765,6 @@ vl_api_sw_interface_set_table_reply_t_handler (vl_api_sw_interface_set_table_rep
 {
     int retval = (int)ntohl((uint32_t)msg->retval);
     set_reply_status(retval);
-
-    if (retval) { SAIVPP_ERROR("sw interface vrf set failed(%d)", retval); }
-    else { SAIVPP_INFO("sw interface vrf set successful"); }
 }
 
 static void
@@ -769,9 +772,6 @@ vl_api_sw_interface_add_del_address_reply_t_handler (vl_api_sw_interface_add_del
 {
     int retval = (int)ntohl((uint32_t)msg->retval);
     set_reply_status(retval);
-
-    if (retval) { SAIVPP_ERROR("sw interface address add/del failed(%d)", retval); }
-    else { SAIVPP_INFO("sw interface address add/del successful"); }
 }
 
 static void
@@ -779,9 +779,6 @@ vl_api_sw_interface_set_flags_reply_t_handler (vl_api_sw_interface_set_flags_rep
 {
     int retval = (int)ntohl((uint32_t)msg->retval);
     set_reply_status(retval);
-
-    if (retval) { SAIVPP_ERROR("sw interface state set failed(%d)", retval); }
-    else { SAIVPP_INFO("sw interface state set successful"); }
 }
 
 static void
@@ -789,27 +786,18 @@ vl_api_sw_interface_set_mtu_reply_t_handler (vl_api_sw_interface_set_mtu_reply_t
 {
     int retval = (int)ntohl((uint32_t)msg->retval);
     set_reply_status(retval);
-
-    if (retval) { SAIVPP_ERROR("sw interface mtu set failed(%d)", retval); }
-    else { SAIVPP_INFO("sw interface mtu set successful"); }
 }
 static void
 vl_api_sw_interface_set_mac_address_reply_t_handler (vl_api_sw_interface_set_mac_address_reply_t *msg)
 {
     int retval = (int)ntohl((uint32_t)msg->retval);
     set_reply_status(retval);
-
-    if (retval) { SAIVPP_ERROR("sw interface mac set failed(%d)", retval); }
-    else { SAIVPP_INFO("sw interface mac set successful"); }
 }
 static void
 vl_api_hw_interface_set_mtu_reply_t_handler (vl_api_hw_interface_set_mtu_reply_t *msg)
 {
     int retval = (int)ntohl((uint32_t)msg->retval);
     set_reply_status(retval);
-
-    if (retval) { SAIVPP_ERROR("hw interface mtu set failed(%d)", retval); }
-    else { SAIVPP_INFO("hw interface mtu set successful"); }
 }
 
 static void
@@ -817,9 +805,6 @@ vl_api_ip_table_add_del_reply_t_handler (vl_api_ip_table_add_del_reply_t *msg)
 {
     int retval = (int)ntohl((uint32_t)msg->retval);
     set_reply_status(retval);
-
-    if (retval) { SAIVPP_ERROR("ip vrf add failed(%d)", retval); }
-    else { SAIVPP_INFO("ip vrf add successful"); }
 }
 
 static void
@@ -827,9 +812,6 @@ vl_api_ip_route_add_del_reply_t_handler (vl_api_ip_route_add_del_reply_t *msg)
 {
     int retval = (int)ntohl((uint32_t)msg->retval);
     set_reply_status(retval);
-
-    if (retval) { SAIVPP_ERROR("ip route add failed(%d)", retval); }
-    else { SAIVPP_INFO("ip route add successful"); }
 }
 
 static void
@@ -838,9 +820,6 @@ vl_api_sw_interface_ip6_enable_disable_reply_t_handler(
 {
     int retval = (int)ntohl((uint32_t)msg->retval);
     set_reply_status(retval);
-
-    if (retval) { SAIVPP_ERROR("ip6 enable/disable failed(%d)", retval); }
-    else { SAIVPP_INFO("ip6 enable/disable successful"); }
 }
 
 static void
@@ -848,9 +827,6 @@ vl_api_set_ip_flow_hash_v2_reply_t_handler (vl_api_ip_route_add_del_reply_t *msg
 {
     int retval = (int)ntohl((uint32_t)msg->retval);
     set_reply_status(retval);
-
-    if (retval) { SAIVPP_ERROR("ip flow has set failed(%d)", retval); }
-    else { SAIVPP_INFO("ip flow has set successful"); }
 }
 
 static void
@@ -858,9 +834,6 @@ vl_api_ip_neighbor_add_del_reply_t_handler (vl_api_ip_neighbor_add_del_reply_t *
 {
     int retval = (int)ntohl((uint32_t)msg->retval);
     set_reply_status(retval);
-
-    if (retval) { SAIVPP_ERROR("ip neighbor add/del failed(%d)", retval); }
-    else { SAIVPP_INFO("ip neighbor add/del successful"); }
 }
 
 static void
@@ -868,39 +841,24 @@ vl_api_bridge_domain_add_del_reply_t_handler (vl_api_bridge_domain_add_del_reply
 {
     int retval = (int)ntohl((uint32_t)msg->retval);
     set_reply_status(retval);
-
-    if (retval) { SAIVPP_ERROR("bridge_domain_add_del add/del failed(%d)", retval); }
-    else { SAIVPP_INFO("bridge_domain_add_del add/del successful"); }
-
 }
 static void
 vl_api_sw_interface_set_l2_bridge_reply_t_handler (vl_api_sw_interface_set_l2_bridge_reply_t *msg)
 {
     int retval = (int)ntohl((uint32_t)msg->retval);
     set_reply_status(retval);
-
-    if (retval) { SAIVPP_ERROR("sw inteface set l2 bridge reply handler failed(%d)", retval); }
-    else { SAIVPP_INFO("sw inteface set l2 bridge reply handler successful"); }
-
 }
 static void
 vl_api_l2_interface_vlan_tag_rewrite_reply_t_handler (vl_api_l2_interface_vlan_tag_rewrite_reply_t *msg)
 {
     int retval = (int)ntohl((uint32_t)msg->retval);
     set_reply_status(retval);
-
-    if (retval) { SAIVPP_ERROR("l2 interface vlan tag rewrite reply handler failed(%d)", retval); }
-    else { SAIVPP_INFO("l2 interface vlan tag rewrite reply handler successful"); }
-
 }
 static void
 vl_api_bvi_create_reply_t_handler (vl_api_bvi_create_reply_t *msg)
 {
     int retval = (int)ntohl((uint32_t)msg->retval);
     set_reply_status(retval);
-
-    if (retval) { SAIVPP_ERROR("bvi create reply handler failed(%d)", retval); }
-    else { SAIVPP_INFO("bvi create reply handler successful"); }
 }
 
 static void
@@ -908,9 +866,6 @@ vl_api_bvi_delete_reply_t_handler (vl_api_bvi_delete_reply_t *msg)
 {
     int retval = (int)ntohl((uint32_t)msg->retval);
     set_reply_status(retval);
-
-    if (retval) { SAIVPP_ERROR("bvi delete reply handler failed(%d)", retval); }
-    else { SAIVPP_INFO("bvi delete reply handler successful"); }
 }
 
 static void
@@ -918,9 +873,6 @@ vl_api_bridge_flags_reply_t_handler (vl_api_bridge_flags_reply_t *msg)
 {
     int retval = (int)ntohl((uint32_t)msg->retval);
     set_reply_status(retval);
-
-    if (retval) { SAIVPP_ERROR("bridge flags reply handler failed(%d)", retval); }
-    else { SAIVPP_INFO("bridge flags reply handler successful"); }
 }
 
 static void
@@ -928,30 +880,18 @@ vl_api_l2fib_add_del_reply_t_handler (vl_api_l2fib_add_del_reply_t *msg)
 {
     int retval = (int)ntohl((uint32_t)msg->retval);
     set_reply_status(retval);
-
-    if (retval) { SAIVPP_ERROR("l2fib add del reply handler failed(%d)", retval); }
-    else { SAIVPP_INFO("l2fib add del reply handler successful"); }
-
 }
 static void
 vl_api_l2fib_flush_all_reply_t_handler (vl_api_l2fib_flush_all_reply_t *msg)
 {
     int retval = (int)ntohl((uint32_t)msg->retval);
     set_reply_status(retval);
-
-    if (retval) { SAIVPP_ERROR("l2fib flush all reply handler failed(%d)", retval); }
-    else { SAIVPP_INFO("l2fib flush all reply handler successful"); }
-
 }
 static void
 vl_api_l2fib_flush_int_reply_t_handler (vl_api_l2fib_flush_int_reply_t *msg)
 {
     int retval = (int)ntohl((uint32_t)msg->retval);
     set_reply_status(retval);
-
-    if (retval) { SAIVPP_ERROR("l2fib flush int reply handler failed(%d)", retval); }
-    else { SAIVPP_INFO("l2fib flush int reply handler successful"); }
-
 }
 
 static void
@@ -959,9 +899,6 @@ vl_api_l2fib_flush_bd_reply_t_handler (vl_api_l2fib_flush_bd_reply_t *msg)
 {
     int retval = (int)ntohl((uint32_t)msg->retval);
     set_reply_status(retval);
-
-    if (retval) { SAIVPP_ERROR("l2fib flush bd reply handler failed(%d)", retval); }
-    else { SAIVPP_INFO("l2fib flush bd reply handler successful"); }
 }
 
 static void
@@ -969,10 +906,6 @@ vl_api_bfd_udp_add_reply_t_handler (vl_api_bfd_udp_add_reply_t *msg)
 {
     int retval = (int)ntohl((uint32_t)msg->retval);
     set_reply_status(retval);
-
-    if (retval) { SAIVPP_ERROR("bfd udp add reply handler  failed(%d)", retval); }
-    else { SAIVPP_INFO("bfd udp add reply handler  successful"); }
-
 }
 
 static void
@@ -980,10 +913,6 @@ vl_api_bfd_udp_del_reply_t_handler (vl_api_bfd_udp_del_reply_t *msg)
 {
     int retval = (int)ntohl((uint32_t)msg->retval);
     set_reply_status(retval);
-
-    if (retval) { SAIVPP_ERROR("bfd udp del reply handler  failed(%d)", retval); }
-    else { SAIVPP_INFO("bfd udp del reply handler  successful"); }
-
 }
 
 static void
@@ -991,9 +920,6 @@ vl_api_want_bfd_events_reply_t_handler (vl_api_want_bfd_events_reply_t *msg)
 {
     int retval = (int)ntohl((uint32_t)msg->retval);
     set_reply_status(retval);
-
-    if (retval) { SAIVPP_ERROR("bfd events enable failed(%d)", retval); }
-    else { SAIVPP_INFO("bfd events enable successful"); }
 }
 
 static void
@@ -1001,9 +927,6 @@ vl_api_bfd_udp_enable_multihop_reply_t_handler (vl_api_bfd_udp_enable_multihop_r
 {
     int retval = (int)ntohl((uint32_t)msg->retval);
     set_reply_status(retval);
-
-    if (retval) { SAIVPP_ERROR("bfd enable multihop failed(%d)", retval); }
-    else { SAIVPP_INFO("bfd enable multihop successful"); }
 }
 
 static void
@@ -1066,8 +989,6 @@ vl_api_vxlan_add_del_tunnel_v3_reply_t_handler (
 
     int retval = (int)ntohl((uint32_t)msg->retval);
     set_reply_status(retval);
-    if (retval) { SAIVPP_ERROR("vxlan_add_del handler failed(%d)", retval); }
-    else { SAIVPP_INFO("vxlan_add_del handler successful: if_idx,%d", ntohl(msg->sw_if_index)); }
 }
 
 static void
@@ -1079,8 +1000,6 @@ vl_api_tunterm_acl_add_replace_reply_t_handler(vl_api_tunterm_acl_add_replace_re
     uint32_t *tunterm_index = (uint32_t *) get_index_ptr(msg->context);
     *tunterm_index = ntohl(msg->tunterm_acl_index);
 
-    if (retval) { SAIVPP_ERROR("tunterm acl add_replace failed(%d) tunterm_index index %u", retval, *tunterm_index); }
-    else { SAIVPP_INFO("tunterm acl add_replace successful tunterm_index index %u", *tunterm_index); }
     release_index(msg->context);
 }
 
@@ -1089,9 +1008,6 @@ vl_api_tunterm_acl_del_reply_t_handler(vl_api_tunterm_acl_del_reply_t *msg)
 {
     int retval = (int)ntohl((uint32_t)msg->retval);
     set_reply_status(retval);
-
-    if (retval) { SAIVPP_ERROR("tunterm acl del failed(%d)", retval); }
-    else { SAIVPP_INFO("tunterm acl del successful"); }
 }
 
 static void
@@ -1099,9 +1015,6 @@ vl_api_tunterm_acl_interface_add_del_reply_t_handler(vl_api_tunterm_acl_interfac
 {
     int retval = (int)ntohl((uint32_t)msg->retval);
     set_reply_status(retval);
-
-    if (retval) { SAIVPP_ERROR("tunterm acl interface set/reset failed(%d)", retval); }
-    else { SAIVPP_INFO("tunterm acl interface set/reset successful"); }
 }
 
 static void
@@ -1114,14 +1027,6 @@ vl_api_bond_create_reply_t_handler (vl_api_bond_create_reply_t *msg)
       u32 *swif_idx = (u32 *) get_index_ptr(msg->context);
       *swif_idx = ntohl(msg->sw_if_index);
     }
-
-    if (retval) { SAIVPP_ERROR("bond add failed(%d)", retval); }
-    else
-    {
-        uint32_t bond_if_index =  ntohl(msg->sw_if_index);
-        SAIVPP_INFO("created bond if index%d", bond_if_index);
-    }
-
 }
 
 static void
@@ -1129,9 +1034,6 @@ vl_api_bond_delete_reply_t_handler (vl_api_bond_delete_reply_t *msg)
 {
     int retval = (int)ntohl((uint32_t)msg->retval);
     set_reply_status(retval);
-
-    if (retval) { SAIVPP_ERROR("bond delete failed(%d)", retval); }
-    else { SAIVPP_INFO("bond delete successful"); }
 }
 
 static void
@@ -1139,9 +1041,6 @@ vl_api_bond_add_member_reply_t_handler (vl_api_bond_add_member_reply_t *msg)
 {
     int retval = (int)ntohl((uint32_t)msg->retval);
     set_reply_status(retval);
-
-    if (retval) { SAIVPP_ERROR("bond add member failed(%d)", retval); }
-    else { SAIVPP_INFO("bond add member successful"); }
 }
 
 static void
@@ -1149,9 +1048,6 @@ vl_api_bond_detach_member_reply_t_handler (vl_api_bond_detach_member_reply_t *ms
 {
     int retval = (int)ntohl((uint32_t)msg->retval);
     set_reply_status(retval);
-
-    if (retval) { SAIVPP_ERROR("bond detach member failed(%d)", retval); }
-    else { SAIVPP_INFO("bond detach member successful"); }
 }
 
 static void
@@ -1159,9 +1055,6 @@ vl_api_sr_localsid_add_del_reply_t_handler(vl_api_sr_localsid_add_del_reply_t *m
 {
     int retval = (int)ntohl((uint32_t)msg->retval);
     set_reply_status(retval);
-
-    if (retval) { SAIVPP_ERROR("sr local sid add/del failed(%d)", retval); }
-    else { SAIVPP_INFO("sr local sid add/del successful"); }
 }
 
 static void
@@ -1169,9 +1062,6 @@ vl_api_sr_policy_add_v2_reply_t_handler(vl_api_sr_policy_add_v2_reply_t *msg)
 {
     int retval = (int)ntohl((uint32_t)msg->retval);
     set_reply_status(retval);
-
-    if (retval) { SAIVPP_ERROR("sr policy add failed(%d)", retval); }
-    else { SAIVPP_INFO("sr policy add successful"); }
 }
 
 static void
@@ -1179,9 +1069,6 @@ vl_api_sr_policy_del_reply_t_handler(vl_api_sr_policy_del_reply_t *msg)
 {
     int retval = (int)ntohl((uint32_t)msg->retval);
     set_reply_status(retval);
-
-    if (retval) { SAIVPP_ERROR("sr policy del failed(%d)", retval); }
-    else { SAIVPP_INFO("sr policy del successful"); }
 }
 
 static void
@@ -1189,9 +1076,6 @@ vl_api_sr_steering_add_del_reply_t_handler(vl_api_sr_steering_add_del_reply_t *m
 {
     int retval = (int)ntohl((uint32_t)msg->retval);
     set_reply_status(retval);
-
-    if (retval) { SAIVPP_ERROR("sr steer add/del failed(%d)", retval); }
-    else { SAIVPP_INFO("sr steer add/del successful"); }
 }
 
 static void
@@ -1199,9 +1083,6 @@ vl_api_sr_set_encap_source_reply_t_handler(vl_api_sr_set_encap_source_reply_t *m
 {
     int retval = (int)ntohl((uint32_t)msg->retval);
     set_reply_status(retval);
-
-    if (retval) { SAIVPP_ERROR("sr set encap source failed(%d)", retval); }
-    else { SAIVPP_INFO("sr set encap source successful"); }
 }
 
 #define vl_api_get_first_msg_id_reply_t_handler vl_noop_handler
@@ -1320,18 +1201,12 @@ static void vl_api_lcp_itf_pair_add_del_reply_t_handler(vl_api_lcp_itf_pair_add_
 {
     int retval = (int)ntohl((uint32_t)msg->retval);
     set_reply_status(retval);
-
-    if (retval) { SAIVPP_ERROR("linux_cp hostif creation failed(%d)", retval); }
-    else { SAIVPP_INFO("linux_cp hostif creation successful"); }
 }
 
 static void vl_api_lcp_ethertype_enable_reply_t_handler(vl_api_lcp_ethertype_enable_reply_t *msg)
 {
     int retval = (int)ntohl((uint32_t)msg->retval);
     set_reply_status(retval);
-
-    if (retval) { SAIVPP_ERROR("linux_cp ethertype enabled failed(%d)", retval); }
-    else { SAIVPP_INFO("linux_cp ethertype enabled successful"); }
 }
 
 static void vl_api_acl_add_replace_reply_t_handler(vl_api_acl_add_replace_reply_t *msg)
@@ -1342,8 +1217,6 @@ static void vl_api_acl_add_replace_reply_t_handler(vl_api_acl_add_replace_reply_
     uint32_t *acl_index = (uint32_t *) get_index_ptr(msg->context);
     *acl_index = ntohl(msg->acl_index);
 
-    if (retval) { SAIVPP_ERROR("acl add_replace failed(%d) acl index %u", retval, *acl_index); }
-    else { SAIVPP_INFO("acl add_replace successful acl index %u", *acl_index); }
     release_index(msg->context);
 }
 
@@ -1351,9 +1224,6 @@ static void vl_api_acl_del_reply_t_handler(vl_api_acl_del_reply_t *msg)
 {
     int retval = (int)ntohl((uint32_t)msg->retval);
     set_reply_status(retval);
-
-    if (retval) { SAIVPP_ERROR("acl del failed(%d)", retval); }
-    else { SAIVPP_INFO("acl del successful"); }
 }
 
 static void
@@ -1361,9 +1231,6 @@ vl_api_acl_stats_intf_counters_enable_reply_t_handler (vl_api_acl_stats_intf_cou
 {
     int retval = (int)ntohl((uint32_t)msg->retval);
     set_reply_status(retval);
-
-    if (retval) { SAIVPP_ERROR("acl counters enable failed(%d)", retval); }
-    else { SAIVPP_INFO("acl counters enable successful"); }
 }
 
 static void
@@ -1371,9 +1238,6 @@ vl_api_acl_interface_add_del_reply_t_handler(vl_api_acl_interface_add_del_reply_
 {
     int retval = (int)ntohl((uint32_t)msg->retval);
     set_reply_status(retval);
-
-    if (retval) { SAIVPP_ERROR("acl interface set/reset failed(%d)", retval); }
-    else { SAIVPP_INFO("acl interface set/reset successful"); }
 }
 
 #define LCP_MSG_ID(id) \
@@ -1655,6 +1519,11 @@ static int config_lcp_hostif (vat_main_t *vam,
 
     WR (ret);
 
+    ret = vpp_normalize_ret(ret, !is_add, __func__);
+
+    if (ret) { SAIVPP_ERROR("%s failed(%d) if_idx %u hostif %s is_add %d", __func__, ret, if_idx, hostif_name, is_add); }
+    else { SAIVPP_INFO("%s if_idx %u hostif %s is_add %d", __func__, if_idx, hostif_name, is_add); }
+
     VPP_UNLOCK();
 
     return ret;
@@ -1681,6 +1550,9 @@ static int __create_loopback_instance (vat_main_t *vam, u32 instance)
 
     WR (ret);
 
+    if (ret) { SAIVPP_ERROR("%s failed(%d) instance %u", __func__, ret, instance); }
+    else { SAIVPP_INFO("%s instance %u", __func__, instance); }
+
     VPP_UNLOCK();
 
     return ret;
@@ -1710,6 +1582,11 @@ static int __delete_loopback (vat_main_t *vam, const char *hwif_name, u32 instan
 
     WR (ret);
 
+    ret = vpp_normalize_ret(ret, true, __func__);
+
+    if (ret) { SAIVPP_ERROR("%s failed(%d) %s instance %u", __func__, ret, hwif_name, instance); }
+    else { SAIVPP_INFO("%s %s instance %u", __func__, hwif_name, instance); }
+
     VPP_UNLOCK();
 
     return ret;
@@ -1735,6 +1612,9 @@ static int __create_sub_interface (vat_main_t *vam, vl_api_interface_index_t if_
 
     WR (ret);
 
+    if (ret) { SAIVPP_ERROR("%s failed(%d) if_idx %u sub_id %u vlan %u", __func__, ret, if_idx, sub_id, vlan_id); }
+    else { SAIVPP_INFO("%s if_idx %u sub_id %u vlan %u", __func__, if_idx, sub_id, vlan_id); }
+
     VPP_UNLOCK();
 
     return ret;
@@ -1755,6 +1635,11 @@ static int __delete_sub_interface (vat_main_t *vam, vl_api_interface_index_t if_
 
     WR (ret);
 
+    ret = vpp_normalize_ret(ret, true, __func__);
+
+    if (ret) { SAIVPP_ERROR("%s failed(%d) if_idx %u", __func__, ret, if_idx); }
+    else { SAIVPP_INFO("%s if_idx %u", __func__, if_idx); }
+
     VPP_UNLOCK();
 
     return ret;
@@ -1906,6 +1791,9 @@ static int __set_interface_vrf (vat_main_t *vam, vl_api_interface_index_t if_idx
 
     WR (ret);
 
+    if (ret) { SAIVPP_ERROR("%s failed(%d) if_idx %u vrf_id %u is_ipv6 %d", __func__, ret, if_idx, vrf_id, is_ipv6); }
+    else { SAIVPP_INFO("%s if_idx %u vrf_id %u is_ipv6 %d", __func__, if_idx, vrf_id, is_ipv6); }
+
     VPP_UNLOCK();
 
     return ret;
@@ -1944,6 +1832,9 @@ static int vpp_intf_events_enable_disable (bool enable)
     S (mp);
     WR (ret);
 
+    if (ret) { SAIVPP_ERROR("%s failed(%d) enable %d", __func__, ret, enable); }
+    else { SAIVPP_INFO("%s enable %d", __func__, enable); }
+
     VPP_UNLOCK();
 
     return ret;
@@ -1968,6 +1859,11 @@ static int __ip_vrf_add_del (vat_main_t *vam, u32 vrf_id,
 
     WR (ret);
 
+    ret = vpp_normalize_ret(ret, !is_add, __func__);
+
+    if (ret) { SAIVPP_ERROR("%s failed(%d) vrf_id %u is_ipv6 %d is_add %d", __func__, ret, vrf_id, is_ipv6, is_add); }
+    else { SAIVPP_INFO("%s vrf_id %u is_ipv6 %d is_add %d", __func__, vrf_id, is_ipv6, is_add); }
+
     VPP_UNLOCK();
 
     return ret;
@@ -2013,6 +1909,11 @@ static int __ip_nbr_add_del (vat_main_t *vam, vl_api_address_t *nbr_addr, u32 if
 
     WR (ret);
 
+    ret = vpp_normalize_ret(ret, !is_add, __func__);
+
+    if (ret) { SAIVPP_ERROR("%s failed(%d) if_idx %u is_add %d", __func__, ret, if_idx, is_add); }
+    else { SAIVPP_INFO("%s if_idx %u is_add %d", __func__, if_idx, is_add); }
+
     VPP_UNLOCK();
     return ret;
 }
@@ -2144,6 +2045,11 @@ int ip_route_add_del (vpp_ip_route_t *prefix, bool is_add)
 
     WR (ret);
 
+    ret = vpp_normalize_ret(ret, !is_add, __func__);
+
+    if (ret) { SAIVPP_ERROR("%s failed(%d) vrf %u prefix_len %u is_add %d", __func__, ret, prefix->vrf_id, prefix->prefix_len, is_add); }
+    else { SAIVPP_INFO("%s vrf %u prefix_len %u is_add %d", __func__, prefix->vrf_id, prefix->prefix_len, is_add); }
+
     VPP_UNLOCK();
 
     return ret;
@@ -2282,6 +2188,9 @@ int vpp_acl_add_replace (vpp_acl_t *in_acl, uint32_t *acl_index, bool is_replace
 
     WR (ret);
 
+    if (ret) { SAIVPP_ERROR("%s failed(%d) acl_index %u is_replace %d", __func__, ret, *acl_index, is_replace); }
+    else { SAIVPP_INFO("%s acl_index %u is_replace %d", __func__, *acl_index, is_replace); }
+
     VPP_UNLOCK();
 
     return ret;
@@ -2303,6 +2212,11 @@ int vpp_acl_del (uint32_t acl_index)
     S (mp);
     WR (ret);
 
+    ret = vpp_normalize_ret(ret, true, __func__);
+
+    if (ret) { SAIVPP_ERROR("%s failed(%d) acl_index %u", __func__, ret, acl_index); }
+    else { SAIVPP_INFO("%s acl_index %u", __func__, acl_index); }
+
     VPP_UNLOCK();
 
     return ret;
@@ -2339,6 +2253,11 @@ int vpp_tunterm_acl_interface_add_del (uint32_t tunterm_index, bool is_bind, con
     S (mp);
     WR (ret);
 
+    ret = vpp_normalize_ret(ret, !is_bind, __func__);
+
+    if (ret) { SAIVPP_ERROR("%s failed(%d) tunterm_index %u is_bind %d", __func__, ret, tunterm_index, is_bind); }
+    else { SAIVPP_INFO("%s tunterm_index %u is_bind %d", __func__, tunterm_index, is_bind); }
+
     VPP_UNLOCK();
 
     return ret;
@@ -2361,6 +2280,11 @@ int vpp_tunterm_acl_del (uint32_t tunterm_index)
     S (mp);
     WR (ret);
 
+    ret = vpp_normalize_ret(ret, true, __func__);
+
+    if (ret) { SAIVPP_ERROR("%s failed(%d) tunterm_index %u", __func__, ret, tunterm_index); }
+    else { SAIVPP_INFO("%s tunterm_index %u", __func__, tunterm_index); }
+
     VPP_UNLOCK();
 
     return ret;
@@ -2441,6 +2365,9 @@ int vpp_tunterm_acl_add_replace (uint32_t *tunterm_index, uint32_t count, vpp_tu
 
     WR (ret);
 
+    if (ret) { SAIVPP_ERROR("%s failed(%d) count %u", __func__, ret, count); }
+    else { SAIVPP_INFO("%s tunterm_index %u count %u", __func__, *tunterm_index, count); }
+
     VPP_UNLOCK();
 
     return ret;
@@ -2462,6 +2389,9 @@ static int vpp_acl_counters_enable_disable (bool enable)
     S (mp);
     WR (ret);
 
+    if (ret) { SAIVPP_ERROR("%s failed(%d) enable %d", __func__, ret, enable); }
+    else { SAIVPP_INFO("%s enable %d", __func__, enable); }
+
     VPP_UNLOCK();
 
     return ret;
@@ -2506,6 +2436,12 @@ int __vpp_acl_interface_bind_unbind (const char *hwif_name, uint32_t acl_index,
         SAIVPP_NOTICE("ACL index %u is already bound to %s", acl_index, hwif_name);
         ret = 0;
     }
+
+    ret = vpp_normalize_ret(ret, !is_bind, __func__);
+
+    if (ret) { SAIVPP_ERROR("%s failed(%d) acl_index %u is_input %d is_bind %d %s", __func__, ret, acl_index, is_input, is_bind, hwif_name); }
+    else { SAIVPP_INFO("%s acl_index %u is_input %d is_bind %d %s", __func__, acl_index, is_input, is_bind, hwif_name); }
+
     VPP_UNLOCK();
 
     return ret;
@@ -2548,6 +2484,9 @@ int vpp_ip_flow_hash_set (uint32_t vrf_id, uint32_t hash_mask, int addr_family)
     S (mp);
     WR (ret);
 
+    if (ret) { SAIVPP_ERROR("%s failed(%d) vrf_id %u af %d", __func__, ret, vrf_id, addr_family); }
+    else { SAIVPP_INFO("%s vrf_id %u af %d", __func__, vrf_id, addr_family); }
+
     VPP_UNLOCK();
 
     return ret;
@@ -2606,6 +2545,11 @@ int interface_ip_address_add_del (const char *hwif_name, vpp_ip_route_t *prefix,
 
     WR (ret);
 
+    ret = vpp_normalize_ret(ret, !is_add, __func__);
+
+    if (ret) { SAIVPP_ERROR("%s failed(%d) %s prefix_len %u is_add %d", __func__, ret, hwif_name, prefix->prefix_len, is_add); }
+    else { SAIVPP_INFO("%s %s prefix_len %u is_add %d", __func__, hwif_name, prefix->prefix_len, is_add); }
+
     VPP_UNLOCK();
 
     return ret;
@@ -2646,6 +2590,11 @@ int interface_ip_address_del_all (const char *hwif_name)
 
     WR (ret);
 
+    ret = vpp_normalize_ret(ret, true, __func__);
+
+    if (ret) { SAIVPP_ERROR("%s failed(%d) %s", __func__, ret, hwif_name); }
+    else { SAIVPP_INFO("%s %s", __func__, hwif_name); }
+
     VPP_UNLOCK();
 
     return ret;
@@ -2683,6 +2632,9 @@ int interface_set_state (const char *hwif_name, bool is_up)
 
     WR (ret);
 
+    if (ret) { SAIVPP_ERROR("%s failed(%d) %s is_up %d", __func__, ret, hwif_name, is_up); }
+    else { SAIVPP_INFO("%s %s is_up %d", __func__, hwif_name, is_up); }
+
     VPP_UNLOCK();
 
     return ret;
@@ -2786,6 +2738,9 @@ int sw_interface_set_mtu (const char *hwif_name, uint32_t mtu)
 
     WR (ret);
 
+    if (ret) { SAIVPP_ERROR("%s failed(%d) %s mtu %u", __func__, ret, hwif_name, mtu); }
+    else { SAIVPP_INFO("%s %s mtu %u", __func__, hwif_name, mtu); }
+
     VPP_UNLOCK();
 
     return ret;
@@ -2830,6 +2785,9 @@ int sw_interface_set_mac (const char *hwif_name, uint8_t *mac_address)
 
     WR (ret);
 
+    if (ret) { SAIVPP_ERROR("%s failed(%d) %s", __func__, ret, hwif_name); }
+    else { SAIVPP_INFO("%s %s", __func__, hwif_name); }
+
     VPP_UNLOCK();
 
     return ret;
@@ -2867,6 +2825,9 @@ int hw_interface_set_mtu (const char *hwif_name, uint32_t mtu)
 
     WR (ret);
 
+    if (ret) { SAIVPP_ERROR("%s failed(%d) %s mtu %u", __func__, ret, hwif_name, mtu); }
+    else { SAIVPP_INFO("%s %s mtu %u", __func__, hwif_name, mtu); }
+
     VPP_UNLOCK();
 
     return ret;
@@ -2904,6 +2865,9 @@ int sw_interface_ip6_enable_disable(const char *hwif_name, bool enable)
 
     WR (ret);
 
+    if (ret) { SAIVPP_ERROR("%s failed(%d) %s enable %d", __func__, ret, hwif_name, enable); }
+    else { SAIVPP_INFO("%s %s enable %d", __func__, hwif_name, enable); }
+
     VPP_UNLOCK();
 
     return ret;
@@ -2927,6 +2891,11 @@ int vpp_bridge_domain_add_del(uint32_t bridge_id, bool is_add)
 
     WR (ret);
 
+    ret = vpp_normalize_ret(ret, !is_add, __func__);
+
+    if (ret) { SAIVPP_ERROR("%s failed(%d) bd_id %u is_add %d", __func__, ret, bridge_id, is_add); }
+    else { SAIVPP_INFO("%s bd_id %u is_add %d", __func__, bridge_id, is_add); }
+
     VPP_UNLOCK();
 
     return ret;
@@ -2961,6 +2930,9 @@ int set_sw_interface_l2_bridge_by_index(uint32_t sw_if_index, uint32_t bridge_id
 
     WR (ret);
 
+    if (ret) { SAIVPP_ERROR("%s failed(%d) sw_if_index %u bd_id %u l2_mode %d", __func__, ret, sw_if_index, bridge_id, l2_mode); }
+    else { SAIVPP_INFO("%s sw_if_index %u bd_id %u l2_mode %d", __func__, sw_if_index, bridge_id, l2_mode); }
+
     VPP_UNLOCK();
 
     return ret;
@@ -3021,6 +2993,9 @@ int set_l2_interface_vlan_tag_rewrite(const char *hwif_name, uint32_t tag1, uint
 
     WR (ret);
 
+    if (ret) { SAIVPP_ERROR("%s failed(%d) %s vtr_op %u tag1 %u", __func__, ret, hwif_name, vtr_op, tag1); }
+    else { SAIVPP_INFO("%s %s vtr_op %u tag1 %u", __func__, hwif_name, vtr_op, tag1); }
+
     VPP_UNLOCK();
 
     return ret;
@@ -3088,6 +3063,9 @@ int create_bvi_interface(uint8_t *mac_address, u32 instance)
 
     WR (ret);
 
+    if (ret) { SAIVPP_ERROR("%s failed(%d) instance %u", __func__, ret, instance); }
+    else { SAIVPP_INFO("%s instance %u", __func__, instance); }
+
     VPP_UNLOCK();
 
     return ret;
@@ -3125,6 +3103,11 @@ int delete_bvi_interface(const char *hwif_name)
 
     WR (ret);
 
+    ret = vpp_normalize_ret(ret, true, __func__);
+
+    if (ret) { SAIVPP_ERROR("%s failed(%d) %s", __func__, ret, hwif_name); }
+    else { SAIVPP_INFO("%s %s", __func__, hwif_name); }
+
     VPP_UNLOCK();
 
     return ret;
@@ -3150,6 +3133,9 @@ int set_bridge_domain_flags(uint32_t bd_id, vpp_bd_flags_t flag, bool enable)
 
     WR (ret);
 
+    if (ret) { SAIVPP_ERROR("%s failed(%d) bd_id %u flag %d enable %d", __func__, ret, bd_id, flag, enable); }
+    else { SAIVPP_INFO("%s bd_id %u flag %d enable %d", __func__, bd_id, flag, enable); }
+
     VPP_UNLOCK();
 
     return ret;
@@ -3213,7 +3199,12 @@ int vpp_vxlan_tunnel_add_del(vpp_vxlan_tunnel_t *tunnel, bool is_add, u32 *sw_if
     WR (ret);
     //reply handler needs to set vam->sw_if_index from reply msg
     *sw_if_index = vam->sw_if_index;
-    SAIVPP_INFO("vxlan_add_del done: if_idx,%d",vam->sw_if_index);
+
+    ret = vpp_normalize_ret(ret, !is_add, __func__);
+
+    if (ret) { SAIVPP_ERROR("%s failed(%d) vni %u is_add %d", __func__, ret, tunnel->vni, is_add); }
+    else { SAIVPP_INFO("%s vni %u is_add %d sw_if_index %u", __func__, tunnel->vni, is_add, *sw_if_index); }
+
     VPP_UNLOCK();
     return ret;
 }
@@ -3290,6 +3281,11 @@ int l2fib_add_del(const char *hwif_name, const uint8_t *mac, uint32_t bd_id, boo
 
     WR (ret);
 
+    ret = vpp_normalize_ret(ret, !is_add, __func__);
+
+    if (ret) { SAIVPP_ERROR("%s failed(%d) %s bd_id %u is_add %d", __func__, ret, hwif_name, bd_id, is_add); }
+    else { SAIVPP_INFO("%s %s bd_id %u is_add %d", __func__, hwif_name, bd_id, is_add); }
+
     VPP_UNLOCK();
 
     return ret;
@@ -3313,6 +3309,11 @@ int l2fib_flush_all()
 
     WR (ret);
 
+    ret = vpp_normalize_ret(ret, true, __func__);
+
+    if (ret) { SAIVPP_ERROR("%s failed(%d)", __func__, ret); }
+    else { SAIVPP_INFO("%s", __func__); }
+
     VPP_UNLOCK();
 
     return ret;
@@ -3357,6 +3358,11 @@ int l2fib_flush_int(const char *hwif_name)
 
     WR (ret);
 
+    ret = vpp_normalize_ret(ret, true, __func__);
+
+    if (ret) { SAIVPP_ERROR("%s failed(%d) %s", __func__, ret, hwif_name); }
+    else { SAIVPP_INFO("%s %s", __func__, hwif_name); }
+
     VPP_UNLOCK();
 
     return ret;
@@ -3388,6 +3394,11 @@ int l2fib_flush_bd(uint32_t bd_id)
 
     WR (ret);
 
+    ret = vpp_normalize_ret(ret, true, __func__);
+
+    if (ret) { SAIVPP_ERROR("%s failed(%d) bd_id %u", __func__, ret, bd_id); }
+    else { SAIVPP_INFO("%s bd_id %u", __func__, bd_id); }
+
     VPP_UNLOCK();
 
     return ret;
@@ -3458,6 +3469,9 @@ int bfd_udp_add(bool multihop, const char *hwif_name, vpp_ip_addr_t *local_addr,
 
     WR (ret);
 
+    if (ret) { SAIVPP_ERROR("%s failed(%d) multihop %d", __func__, ret, multihop); }
+    else { SAIVPP_INFO("%s multihop %d", __func__, multihop); }
+
     VPP_UNLOCK();
 
     return ret;
@@ -3523,6 +3537,11 @@ int bfd_udp_del(bool multihop, const char *hwif_name, vpp_ip_addr_t *local_addr,
 
     WR (ret);
 
+    ret = vpp_normalize_ret(ret, true, __func__);
+
+    if (ret) { SAIVPP_ERROR("%s failed(%d) multihop %d", __func__, ret, multihop); }
+    else { SAIVPP_INFO("%s multihop %d", __func__, multihop); }
+
     VPP_UNLOCK();
 
     return ret;
@@ -3545,6 +3564,9 @@ static int vpp_bfd_events_enable_disable (bool enable)
     S (mp);
     WR (ret);
 
+    if (ret) { SAIVPP_ERROR("%s failed(%d) enable %d", __func__, ret, enable); }
+    else { SAIVPP_INFO("%s enable %d", __func__, enable); }
+
     VPP_UNLOCK();
 
     return ret;
@@ -3565,6 +3587,9 @@ static int vpp_bfd_udp_enable_multihop ()
     S (mp);
     WR (ret);
 
+    if (ret) { SAIVPP_ERROR("%s failed(%d)", __func__, ret); }
+    else { SAIVPP_INFO("%s", __func__); }
+
     VPP_UNLOCK();
 
     return ret;
@@ -3586,6 +3611,9 @@ static int vpp_lcp_ethertype_enable(u16 ethertype)
     S (mp);
     WR (ret);
 
+    if (ret) { SAIVPP_ERROR("%s failed(%d) ethertype 0x%04x", __func__, ret, ethertype); }
+    else { SAIVPP_INFO("%s ethertype 0x%04x", __func__, ethertype); }
+
     VPP_UNLOCK();
 
     return ret;
@@ -3598,7 +3626,6 @@ int create_bond_interface(uint32_t bond_id, uint32_t mode, uint32_t lb, uint32_t
     int ret;
 
     VPP_LOCK();
-    SAIVPP_INFO("Creating bd interface with id %u \n", bond_id);
 
     __plugin_msg_base = bond_msg_id_base;
 
@@ -3615,6 +3642,9 @@ int create_bond_interface(uint32_t bond_id, uint32_t mode, uint32_t lb, uint32_t
 
     WR (ret);
 
+    if (ret) { SAIVPP_ERROR("%s failed(%d) bond_id %u mode %u", __func__, ret, bond_id, mode); }
+    else { SAIVPP_INFO("%s bond_id %u mode %u", __func__, bond_id, mode); }
+
     VPP_UNLOCK();
 
     return ret;
@@ -3627,7 +3657,6 @@ int delete_bond_interface(const char *hwif_name)
     int ret;
 
     VPP_LOCK();
-    SAIVPP_INFO("Removing bond interface %s \n", hwif_name);
 
     __plugin_msg_base = bond_msg_id_base;
 
@@ -3654,6 +3683,11 @@ int delete_bond_interface(const char *hwif_name)
 
     WR (ret);
 
+    ret = vpp_normalize_ret(ret, true, __func__);
+
+    if (ret) { SAIVPP_ERROR("%s failed(%d) %s", __func__, ret, hwif_name); }
+    else { SAIVPP_INFO("%s %s", __func__, hwif_name); }
+
     VPP_UNLOCK();
 
     return ret;
@@ -3665,7 +3699,6 @@ int create_bond_member(uint32_t bond_sw_if_index, const char *hwif_name, bool is
     int ret;
 
     VPP_LOCK();
-    SAIVPP_INFO("Adding member %s to bond interface %u \n", hwif_name, bond_sw_if_index);
 
     __plugin_msg_base = bond_msg_id_base;
 
@@ -3695,6 +3728,9 @@ int create_bond_member(uint32_t bond_sw_if_index, const char *hwif_name, bool is
 
     WR (ret);
 
+    if (ret) { SAIVPP_ERROR("%s failed(%d) %s bond_sw_if_index %u", __func__, ret, hwif_name, bond_sw_if_index); }
+    else { SAIVPP_INFO("%s %s bond_sw_if_index %u", __func__, hwif_name, bond_sw_if_index); }
+
     VPP_UNLOCK();
 
     return ret;
@@ -3714,7 +3750,6 @@ int delete_bond_member(const char * hwif_name)
     int ret;
 
     VPP_LOCK();
-    SAIVPP_INFO("Removing member %s from its bond\n", hwif_name);
 
     __plugin_msg_base = bond_msg_id_base;
 
@@ -3740,6 +3775,14 @@ int delete_bond_member(const char * hwif_name)
 
     WR (ret);
 
+    ret = vpp_normalize_ret(ret, true, __func__);
+
+    if (ret) {
+	SAIVPP_ERROR("%s failed(%d) %s", __func__, ret, hwif_name);
+    } else {
+	SAIVPP_INFO("%s %s", __func__, hwif_name);
+    }
+
     VPP_UNLOCK();
 
     return ret;
@@ -3841,6 +3884,14 @@ int vpp_my_sid_entry_add_del (vpp_my_sid_entry_t *my_sid, bool is_del)
 
     WR (ret);
 
+    ret = vpp_normalize_ret(ret, is_del, __func__);
+
+    if (ret) {
+	SAIVPP_ERROR("%s failed(%d) is_del=%d behavior=%u", __func__, ret, is_del, my_sid->behavior);
+    } else {
+	SAIVPP_INFO("%s is_del=%d behavior=%u", __func__, is_del, my_sid->behavior);
+    }
+
     VPP_UNLOCK();
 
     return ret;
@@ -3890,6 +3941,12 @@ int vpp_sidlist_add(vpp_sidlist_t *sidlist)
 
     WR (ret);
 
+    if (ret) {
+	SAIVPP_ERROR("%s failed(%d) num_sids=%u", __func__, ret, sidlist->sids.num_sids);
+    } else {
+	SAIVPP_INFO("%s num_sids=%u", __func__, sidlist->sids.num_sids);
+    }
+
     VPP_UNLOCK();
 
     return ret;
@@ -3920,6 +3977,14 @@ int vpp_sidlist_del(vpp_ip_addr_t *bsid)
 
     WR (ret);
 
+    ret = vpp_normalize_ret(ret, true, __func__);
+
+    if (ret) {
+	SAIVPP_ERROR("%s failed(%d)", __func__, ret);
+    } else {
+	SAIVPP_INFO("%s", __func__);
+    }
+
     VPP_UNLOCK();
 
     return ret;
@@ -3965,6 +4030,14 @@ int  vpp_sr_steer_add_del(vpp_sr_steer_t *sr_steer, bool is_del)
 
     WR (ret);
 
+    ret = vpp_normalize_ret(ret, is_del, __func__);
+
+    if (ret) {
+	SAIVPP_ERROR("%s failed(%d) is_del=%d fib_table=%u", __func__, ret, is_del, sr_steer->fib_table);
+    } else {
+	SAIVPP_INFO("%s is_del=%d fib_table=%u", __func__, is_del, sr_steer->fib_table);
+    }
+
     VPP_UNLOCK();
 
     return ret;
@@ -3994,6 +4067,12 @@ int vpp_sr_set_encap_source(vpp_ip_addr_t *encap_src)
 
     WR (ret);
 
+    if (ret) {
+	SAIVPP_ERROR("%s failed(%d)", __func__, ret);
+    } else {
+	SAIVPP_INFO("%s", __func__);
+    }
+
     VPP_UNLOCK();
 
     return ret;