diff --git a/hipamd/include/hip/nvidia_detail/nvidia_hip_runtime_api.h b/hipamd/include/hip/nvidia_detail/nvidia_hip_runtime_api.h
index fdeb80f6bb..e6e9bd7a9b 100644
--- a/hipamd/include/hip/nvidia_detail/nvidia_hip_runtime_api.h
+++ b/hipamd/include/hip/nvidia_detail/nvidia_hip_runtime_api.h
@@ -1220,6 +1220,11 @@ inline static hipError_t hipSetDevice(int device) {
 }
 
 inline static hipError_t hipChooseDevice(int* device, const hipDeviceProp_t* prop) {
+
+    if (prop == NULL) {
+      return hipErrorInvalidValue;
+    }
+
     struct cudaDeviceProp cdprop;
     memset(&cdprop, 0x0, sizeof(struct cudaDeviceProp));
     cdprop.major = prop->major;
@@ -1532,6 +1537,11 @@ inline static hipError_t hipMemset3DAsync(hipPitchedPtr pitchedDevPtr, int  valu
 }
 
 inline static hipError_t hipGetDeviceProperties(hipDeviceProp_t* p_prop, int device) {
+
+    if (p_prop == NULL) {
+      return hipErrorInvalidValue;
+    }
+
     struct cudaDeviceProp cdprop;
     cudaError_t cerror;
     cerror = cudaGetDeviceProperties(&cdprop, device);