From 57ff1f1385272d002583dbf921fa33f2af6ea52e Mon Sep 17 00:00:00 2001
From: David Kohler <70915561+kohlerpop1@users.noreply.github.com>
Date: Wed, 17 Sep 2025 18:55:10 -0400
Subject: [PATCH] Only copy roomInfo if its valid and null check safety! (#146)

---
 .../java/io/github/jwdeveloper/tiktok/TikTokLiveClient.java    | 3 ++-
 .../main/java/io/github/jwdeveloper/tiktok/TikTokRoomInfo.java | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLiveClient.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLiveClient.java
index 01b0f09..d38c5c6 100644
--- a/Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLiveClient.java
+++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLiveClient.java
@@ -124,7 +124,6 @@ public class TikTokLiveClient implements LiveClient
         tikTokEventHandler.publish(this, new TikTokConnectingEvent());
         var userDataRequest = new LiveUserData.Request(roomInfo.getHostName());
         var userData = httpClient.fetchLiveUserData(userDataRequest);
-        roomInfo.copy(userData.getRoomInfo());
 
         if (userData.getUserStatus() == LiveUserData.UserStatus.Offline)
             throw new TikTokLiveOfflineHostException("User is offline: " + roomInfo.getHostName(), userData, null);
@@ -132,6 +131,8 @@ public class TikTokLiveClient implements LiveClient
         if (userData.getUserStatus() == LiveUserData.UserStatus.NotFound)
             throw new TikTokLiveUnknownHostException("User not found: " + roomInfo.getHostName(), userData, null);
 
+        roomInfo.copy(userData.getRoomInfo());
+
         var liveDataRequest = new LiveData.Request(userData.getRoomInfo().getRoomId());
         var liveData = httpClient.fetchLiveData(liveDataRequest);
 
diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokRoomInfo.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokRoomInfo.java
index 2420047..45a0348 100644
--- a/Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokRoomInfo.java
+++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokRoomInfo.java
@@ -58,6 +58,7 @@ public class TikTokRoomInfo implements LiveRoomInfo
 
 	@Override
 	public void copy(LiveRoomInfo roomInfo) {
+		if (roomInfo == null) return;
 		this.roomId = roomInfo.getRoomId();
 		this.likesCount = roomInfo.getLikesCount();
 		this.viewersCount = roomInfo.getViewersCount();