diff --git a/lib/nexthop.c b/lib/nexthop.c
index fce4d39e0085..7d40d9fe03ab 100644
--- a/lib/nexthop.c
+++ b/lib/nexthop.c
@@ -899,6 +899,7 @@ void nexthop_copy_no_recurse(struct nexthop *copy,
 	if (nexthop->nh_srv6) {
 		if (nexthop->nh_srv6->seg6local_action ==
 			    ZEBRA_SEG6_LOCAL_ACTION_END_B6_ENCAP &&
+		    nexthop->nh_srv6->seg6_segs &&
 		    nexthop->nh_srv6->seg6_segs->num_segs > 1)
 			nexthop_add_srv6_seg6local(copy,
 						   nexthop->nh_srv6
diff --git a/zebra/rt_netlink.c b/zebra/rt_netlink.c
index 3dbe516e964e..d065a2fe2e00 100644
--- a/zebra/rt_netlink.c
+++ b/zebra/rt_netlink.c
@@ -2679,7 +2679,7 @@ static ssize_t fill_srh_end_b6_encaps(char *buffer, size_t buflen,
 	size_t srhlen;
 	int i;
 
-	if (segs->num_segs > SRV6_MAX_SEGS) {
+	if (!segs || segs->num_segs > SRV6_MAX_SEGS) {
 		/* Exceeding maximum supported SIDs */
 		return -1;
 	}
@@ -2717,6 +2717,8 @@ static int netlink_nexthop_msg_encode_end_b6_encaps(struct buf_req *req,
 		return 0;
 	srh_len = fill_srh_end_b6_encaps(srh_buf, sizeof(srh_buf),
 					 nh->nh_srv6->seg6_segs);
+	if (srh_len < 0)
+		return 0;
 	if (!nl_attr_put(&req->n, buflen, SEG6_LOCAL_SRH, srh_buf, srh_len))
 		return 0;
 	return 1;