diff --git a/src/index.ts b/src/index.ts
index d7226788..36b903f5 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -71,7 +71,9 @@ class LightLivePreviewHoC {
 }
 
 const ContentstackLivePreview =
-    process.env.PURGE_PREVIEW_SDK || process.env.REACT_APP_PURGE_PREVIEW_SDK
+    typeof process !== "undefined" &&
+    (process?.env?.PURGE_PREVIEW_SDK === "true" ||
+        process?.env?.REACT_APP_PURGE_PREVIEW_SDK === "true")
         ? LightLivePreviewHoC
         : ContentstackLivePreviewHOC;
 
diff --git a/src/logger/logger.ts b/src/logger/logger.ts
index 66f810c2..fad32d8b 100644
--- a/src/logger/logger.ts
+++ b/src/logger/logger.ts
@@ -8,7 +8,10 @@ export class PublicLogger {
             | Console["info"],
         message: any[]
     ): void {
-        if (process?.env?.NODE_ENV !== "test") {
+        if (
+            typeof process !== "undefined" &&
+            process?.env?.NODE_ENV !== "test"
+        ) {
             logCallback("Live_Preview_SDK:", ...message);
         }
     }
diff --git a/src/visualBuilder/utils/collabUtils.ts b/src/visualBuilder/utils/collabUtils.ts
index a3e5147a..1664dd06 100644
--- a/src/visualBuilder/utils/collabUtils.ts
+++ b/src/visualBuilder/utils/collabUtils.ts
@@ -90,13 +90,17 @@ export const getMessageWithDisplayName = (
 
     let tempText = sanitizeData(comment.message).replace(/<[^>]*>/g, "");
 
-    comment?.toUsers?.forEach((user) => {
+    comment.toUsers?.forEach((user) => {
         const userPattern = new RegExp(`{{${user}}}`, "g");
         const userData = userState.userMap[user];
+        const displayName = userData
+            ? userData.display || getUserName(userData)
+            : `unknown user`;
+
         const replacement =
             profile === "html"
-                ? `<b class="collab-thread-comment--message">@${userData.display || getUserName(userData)}</b>`
-                : `@${userData.display || getUserName(userData)}`;
+                ? `<b class="collab-thread-comment--message">@${displayName}</b>`
+                : `@${displayName}`;
         tempText = tempText.replace(userPattern, replacement);
     });