diff --git a/projects/clr/hipamd/src/hip_memory.cpp b/projects/clr/hipamd/src/hip_memory.cpp
index 6ecdc4ede6..8ba165be65 100644
--- a/projects/clr/hipamd/src/hip_memory.cpp
+++ b/projects/clr/hipamd/src/hip_memory.cpp
@@ -66,7 +66,9 @@ amd::Memory* getMemoryObjectWithOffset(const void* ptr, const size_t size) {
   amd::Memory* memObj = getMemoryObject(ptr, offset);
 
   if (memObj != nullptr) {
-    assert(size <= (memObj->getSize() - offset));
+    if (size > (memObj->getSize() - offset)) {
+      return nullptr;
+    }
     memObj = new (memObj->getContext()) amd::Buffer(*memObj, memObj->getMemFlags(), offset, size);
     if (memObj == nullptr) {;
       return nullptr;
diff --git a/projects/clr/hipamd/src/hip_texture.cpp b/projects/clr/hipamd/src/hip_texture.cpp
index 9327df4918..8ae5c2abdf 100644
--- a/projects/clr/hipamd/src/hip_texture.cpp
+++ b/projects/clr/hipamd/src/hip_texture.cpp
@@ -293,7 +293,9 @@ hipError_t ihipCreateTextureObject(hipTextureObject_t* pTexObject,
                             0, /* numMipLevels */
                             buffer,
                             status);
-    buffer->release();
+    if (buffer != nullptr) {
+      buffer->release();
+    }
     if (image == nullptr) {
       return status;
     }