diff --git a/zebra/zebra_mpls.c b/zebra/zebra_mpls.c
index 25dd31a3b6..31b100598f 100644
--- a/zebra/zebra_mpls.c
+++ b/zebra/zebra_mpls.c
@@ -1561,7 +1561,8 @@ static void nhlfe_print(zebra_nhlfe_t *nhlfe, struct vty *vty)
 	case NEXTHOP_TYPE_IPV6:
 	case NEXTHOP_TYPE_IPV6_IFINDEX:
 		vty_out(vty, "  via %s",
-			inet_ntop(AF_INET6, &nexthop->gate.ipv6, buf, BUFSIZ));
+			inet_ntop(AF_INET6, &nexthop->gate.ipv6, buf,
+				  sizeof(buf)));
 		if (nexthop->ifindex)
 			vty_out(vty, " dev %s",
 				ifindex2ifname(nexthop->ifindex,
diff --git a/zebra/zebra_rnh.c b/zebra/zebra_rnh.c
index ad2e00b1ec..e94a445098 100644
--- a/zebra/zebra_rnh.c
+++ b/zebra/zebra_rnh.c
@@ -1001,12 +1001,13 @@ static int compare_state(struct route_entry *r1, struct route_entry *r2)
 static int send_client(struct rnh *rnh, struct zserv *client,
 		       enum rnh_type type, vrf_id_t vrf_id)
 {
-	struct stream *s;
+	struct stream *s = NULL;
 	struct route_entry *re;
 	unsigned long nump;
 	uint8_t num;
 	struct nexthop *nh;
 	struct route_node *rn;
+	int ret;
 	int cmd = (type == RNH_IMPORT_CHECK_TYPE) ? ZEBRA_IMPORT_CHECK_UPDATE
 						  : ZEBRA_NEXTHOP_UPDATE;
 
@@ -1032,7 +1033,7 @@ static int send_client(struct rnh *rnh, struct zserv *client,
 		flog_err(EC_ZEBRA_RNH_UNKNOWN_FAMILY,
 			 "%s: Unknown family (%d) notification attempted\n",
 			 __func__, rn->p.family);
-		break;
+		goto failure;
 	}
 	if (re) {
 		struct zapi_nexthop znh;
@@ -1047,7 +1048,10 @@ static int send_client(struct rnh *rnh, struct zserv *client,
 		for (ALL_NEXTHOPS(re->nhe->nhg, nh))
 			if (rnh_nexthop_valid(re, nh)) {
 				zapi_nexthop_from_nexthop(&znh, nh);
-				zapi_nexthop_encode(s, &znh, 0 /* flags */);
+				ret = zapi_nexthop_encode(s, &znh, 0/*flags*/);
+				if (ret < 0)
+					goto failure;
+
 				num++;
 			}
 		stream_putc_at(s, nump, num);
@@ -1063,6 +1067,11 @@ static int send_client(struct rnh *rnh, struct zserv *client,
 	client->nh_last_upd_time = monotime(NULL);
 	client->last_write_cmd = cmd;
 	return zserv_send_message(client, s);
+
+failure:
+	if (s)
+		stream_free(s);
+	return -1;
 }
 
 static void print_nh(struct nexthop *nexthop, struct vty *vty)