diff --git a/rocclr/runtime/device/pal/palconstbuf.cpp b/rocclr/runtime/device/pal/palconstbuf.cpp
index 9121b3f6a2..c0dfd536e2 100644
--- a/rocclr/runtime/device/pal/palconstbuf.cpp
+++ b/rocclr/runtime/device/pal/palconstbuf.cpp
@@ -21,7 +21,7 @@ ManagedBuffer::ManagedBuffer(VirtualGPU& gpu, uint32_t size)
 // ================================================================================================
 void ManagedBuffer::release() {
   for (auto it : buffers_) {
-    if (it->data() != nullptr) {
+    if ((it != nullptr) && (it->data() != nullptr)) {
       it->unmap(&gpu_);
     }
     delete it;