diff --git a/projects/clr/hipamd/src/hip_memory.cpp b/projects/clr/hipamd/src/hip_memory.cpp
index 8fb7b00072..0f359eef0b 100644
--- a/projects/clr/hipamd/src/hip_memory.cpp
+++ b/projects/clr/hipamd/src/hip_memory.cpp
@@ -2608,9 +2608,14 @@ hipError_t hipIpcCloseMemHandle(void* dev_ptr) {
   HIP_RETURN(hipSuccess);
 }
 
+
 hipError_t hipHostGetDevicePointer(void** devicePointer, void* hostPointer, unsigned flags) {
   HIP_INIT_API(hipHostGetDevicePointer, devicePointer, hostPointer, flags);
 
+  if (devicePointer == nullptr) {
+    HIP_RETURN(hipErrorInvalidValue);
+  }
+
   size_t offset = 0;
 
   amd::Memory* memObj = getMemoryObject(hostPointer, offset);