diff --git a/projects/clr/rocclr/device/device.cpp b/projects/clr/rocclr/device/device.cpp
old mode 100644
new mode 100755
index 64bc69d4fb..979fcb0d47
--- a/projects/clr/rocclr/device/device.cpp
+++ b/projects/clr/rocclr/device/device.cpp
@@ -95,12 +95,22 @@ size_t MemObjMap::size() {
 
 void MemObjMap::AddMemObj(const void* k, amd::Memory* v) {
   amd::ScopedLock lock(AllocatedLock_);
-  MemObjMap_.insert({reinterpret_cast<uintptr_t>(k), v});
+  auto rval = MemObjMap_.insert({ reinterpret_cast<uintptr_t>(k), v });
+  if (!rval.second) {
+    DevLogPrintfError("Memobj map already has an entry for ptr: 0x%x",
+                      reinterpret_cast<uintptr_t>(k));
+    guarantee(false);
+  }
 }
 
 void MemObjMap::RemoveMemObj(const void* k) {
   amd::ScopedLock lock(AllocatedLock_);
-  MemObjMap_.erase(reinterpret_cast<uintptr_t>(k));
+  auto rval = MemObjMap_.erase(reinterpret_cast<uintptr_t>(k));
+  if (rval != 1) {
+    DevLogPrintfError("Memobj map does not have ptr: 0x%x",
+                      reinterpret_cast<uintptr_t>(k));
+    guarantee(false);
+  }
 }
 
 amd::Memory* MemObjMap::FindMemObj(const void* k) {