diff --git a/projects/rocr-runtime/src/fmm.c b/projects/rocr-runtime/src/fmm.c
index d6e67701ed..cbec8c9a6c 100644
--- a/projects/rocr-runtime/src/fmm.c
+++ b/projects/rocr-runtime/src/fmm.c
@@ -2595,8 +2595,8 @@ HSAKMT_STATUS fmm_share_memory(void *MemoryAddress,
 		return HSAKMT_STATUS_INVALID_PARAMETER;
 
 	r = validate_nodeid(obj->node_id, &gpu_id);
-	if (r < 0)
-		return HSAKMT_STATUS_ERROR;
+	if (r != HSAKMT_STATUS_SUCCESS)
+		return r;
 
 	exportArgs.handle = obj->handle;
 	exportArgs.gpu_id = gpu_id;
diff --git a/projects/rocr-runtime/src/perfctr.c b/projects/rocr-runtime/src/perfctr.c
index 221b0a1edc..5a0d6bd84a 100644
--- a/projects/rocr-runtime/src/perfctr.c
+++ b/projects/rocr-runtime/src/perfctr.c
@@ -492,7 +492,7 @@ HSAKMT_STATUS HSAKMTAPI hsaKmtPmcGetCounterProperties(HSAuint32 NodeId,
 	if (!CounterProperties)
 		return HSAKMT_STATUS_INVALID_PARAMETER;
 
-	if (validate_nodeid(NodeId, &gpu_id) != 0)
+	if (validate_nodeid(NodeId, &gpu_id) != HSAKMT_STATUS_SUCCESS)
 		return HSAKMT_STATUS_INVALID_NODE_UNIT;
 
 	if (counter_props[NodeId]) {
@@ -706,7 +706,7 @@ HSAKMT_STATUS HSAKMTAPI hsaKmtPmcUnregisterTrace(HSAuint32 NodeId,
 	if (TraceId == 0)
 		return HSAKMT_STATUS_INVALID_PARAMETER;
 
-	if (validate_nodeid(NodeId, &gpu_id) != 0)
+	if (validate_nodeid(NodeId, &gpu_id) != HSAKMT_STATUS_SUCCESS)
 		return HSAKMT_STATUS_INVALID_NODE_UNIT;
 
 	trace = (struct perf_trace *)PORT_UINT64_TO_VPTR(TraceId);