diff --git a/projects/clr/rocclr/runtime/device/device.cpp b/projects/clr/rocclr/runtime/device/device.cpp
index e97b18c82b..da8b95710a 100644
--- a/projects/clr/rocclr/runtime/device/device.cpp
+++ b/projects/clr/rocclr/runtime/device/device.cpp
@@ -984,6 +984,9 @@ cl_int Program::link(const std::vector<Program*>& inputPrograms,
             f.write(logs.data(), logs.size());
             f.close();
         }
+    }
+
+    if (!buildLog_.empty()) {
         LogError(buildLog_.c_str());
     }
 
@@ -1079,6 +1082,9 @@ Program::build(const std::string& sourceCode,
             f.write(logs.data(), logs.size());
             f.close();
         }
+    }
+
+    if (!buildLog_.empty()) {
         LogError(buildLog_.c_str());
     }