diff --git a/projects/clr/rocclr/device/gpu/gpukernel.cpp b/projects/clr/rocclr/device/gpu/gpukernel.cpp
index 6e26afc454..6059cb3372 100644
--- a/projects/clr/rocclr/device/gpu/gpukernel.cpp
+++ b/projects/clr/rocclr/device/gpu/gpukernel.cpp
@@ -3095,7 +3095,9 @@ bool HSAILKernel::init(amd::hsa::loader::Symbol* sym, bool finalize) {
     }
   }
 
-  aqlCreateHWInfo(sym);
+  if (!aqlCreateHWInfo(sym)) {
+    return false;
+  }
 
   // Pull out metadata from the ELF
   size_t sizeOfArgList;
diff --git a/projects/clr/rocclr/device/pal/palkernel.cpp b/projects/clr/rocclr/device/pal/palkernel.cpp
index bae85abc8a..f12bd9077f 100644
--- a/projects/clr/rocclr/device/pal/palkernel.cpp
+++ b/projects/clr/rocclr/device/pal/palkernel.cpp
@@ -143,7 +143,9 @@ bool HSAILKernel::init(amd::hsa::loader::Symbol* sym, bool finalize) {
     }
   }
 
-  aqlCreateHWInfo(sym);
+  if (!aqlCreateHWInfo(sym)) {
+    return false;
+  }
 
   // Pull out metadata from the ELF
   size_t sizeOfArgList;