diff --git a/projects/clr/rocclr/runtime/device/gpu/gpuprogram.cpp b/projects/clr/rocclr/runtime/device/gpu/gpuprogram.cpp
index 7c080f9f89..b78e56b243 100644
--- a/projects/clr/rocclr/runtime/device/gpu/gpuprogram.cpp
+++ b/projects/clr/rocclr/runtime/device/gpu/gpuprogram.cpp
@@ -1819,6 +1819,7 @@ HSAILProgram::linkImpl(
             binaries_to_link[0], binaries_to_link.size() - 1,
             &binaries_to_link[1], ACL_TYPE_LLVMIR_BINARY, "-create-library", NULL);
         if (errorCode != ACL_SUCCESS) {
+            buildLog_ += aclGetCompilerLog(dev().hsaCompiler());
             buildLog_ +="Error while linking : \
                         aclLink failed" ;
             return false;
diff --git a/projects/clr/rocclr/runtime/platform/program.cpp b/projects/clr/rocclr/runtime/platform/program.cpp
index 2e1300a9e4..c579b7f6a1 100644
--- a/projects/clr/rocclr/runtime/platform/program.cpp
+++ b/projects/clr/rocclr/runtime/platform/program.cpp
@@ -354,6 +354,10 @@ Program::link(
         }
     }
 
+    if (retval != CL_SUCCESS) {
+        return retval;
+    }
+
     // Rebuild the symbol table
     deviceprograms_t::iterator sit;
     for (sit = devicePrograms_.begin(); sit != devicePrograms_.end(); ++sit) {