diff --git a/src/common/slurm_protocol_pack.c b/src/common/slurm_protocol_pack.c
index ff7cecd784769c217911ec9eaf458906559f6277..0643c22de2dd1cc9269cf8226e6b34fee57c68ec 100644
--- a/src/common/slurm_protocol_pack.c
+++ b/src/common/slurm_protocol_pack.c
@@ -4093,8 +4093,10 @@ _unpack_node_info_members(node_info_t * node, Buf buffer,
 		safe_unpack_time(&node->reason_time, buffer);
 		safe_unpack_time(&node->slurmd_start_time, buffer);
 
-		select_g_select_nodeinfo_unpack(&node->select_nodeinfo, buffer,
-						protocol_version);
+		if (select_g_select_nodeinfo_unpack(&node->select_nodeinfo,
+						    buffer, protocol_version)
+		    != SLURM_SUCCESS)
+			goto unpack_error;
 
 		safe_unpackstr_xmalloc(&node->arch, &uint32_tmp, buffer);
 		safe_unpackstr_xmalloc(&node->features, &uint32_tmp, buffer);
@@ -4157,8 +4159,10 @@ _unpack_node_info_members(node_info_t * node, Buf buffer,
 		safe_unpack_time(&node->reason_time, buffer);
 		safe_unpack_time(&node->slurmd_start_time, buffer);
 
-		select_g_select_nodeinfo_unpack(&node->select_nodeinfo, buffer,
-						protocol_version);
+		if (select_g_select_nodeinfo_unpack(&node->select_nodeinfo,
+						    buffer, protocol_version)
+		    != SLURM_SUCCESS)
+			goto unpack_error;
 
 		safe_unpackstr_xmalloc(&node->arch, &uint32_tmp, buffer);
 		safe_unpackstr_xmalloc(&node->features, &uint32_tmp, buffer);