diff --git a/projects/clr/hipamd/include/hcc_detail/trace_helper.h b/projects/clr/hipamd/include/hcc_detail/trace_helper.h
index 8ba877f7ec..13af1eab26 100644
--- a/projects/clr/hipamd/include/hcc_detail/trace_helper.h
+++ b/projects/clr/hipamd/include/hcc_detail/trace_helper.h
@@ -58,7 +58,7 @@ inline std::string ToString(T v)
 
 //  hipEvent_t specialization. TODO - maybe add an event ID for debug?
 template <>
-std::string ToString(hipEvent_t v) 
+inline std::string ToString(hipEvent_t v) 
 {
     return ToString(&v);
 };
@@ -67,10 +67,14 @@ std::string ToString(hipEvent_t v)
 
 //  hipStream_t
 template <>
-std::string ToString(hipStream_t v) 
+inline std::string ToString(hipStream_t v) 
 {
     std::ostringstream ss;
-    ss << *v;
+    if (v == NULL) {
+        ss << "stream:<null>";
+    } else {
+        ss << *v;
+    }
 
     return ss.str();
 };