diff --git a/src/main/java/net/server/Server.java b/src/main/java/net/server/Server.java
index 6c61e5ce2a0..9a6417cb0cc 100644
--- a/src/main/java/net/server/Server.java
+++ b/src/main/java/net/server/Server.java
@@ -469,7 +469,10 @@ private int initWorld() {
         }
 
         if (canDeploy) {
-            world.setServerMessage(YamlConfig.config.worlds.get(i).server_message);
+            String serverMessage = YamlConfig.config.worlds.get(i).server_message;
+            if (serverMessage != null) {
+                world.setServerMessage(serverMessage);
+            }
 
             log.info("Finished loading world {}", i);
             return i;
diff --git a/src/main/java/tools/PacketCreator.java b/src/main/java/tools/PacketCreator.java
index e7ff75486ef..1be8b10a789 100644
--- a/src/main/java/tools/PacketCreator.java
+++ b/src/main/java/tools/PacketCreator.java
@@ -1217,7 +1217,7 @@ public static Packet getRelogResponse() {
      * @return The server message packet.
      */
     public static Packet serverMessage(String message) {
-        return serverMessage(4, (byte) 0, message, true, false, 0);
+        return serverMessage(4, (byte) 0, message != null ? message : "", true, false, 0);
     }
 
     /**
diff --git a/src/test/java/tools/PacketCreatorTest.java b/src/test/java/tools/PacketCreatorTest.java
new file mode 100644
index 00000000000..d9e0b13059a
--- /dev/null
+++ b/src/test/java/tools/PacketCreatorTest.java
@@ -0,0 +1,23 @@
+package tools;
+
+import net.packet.Packet;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+class PacketCreatorTest {
+
+    @Test
+    void serverMessage_withValidMessage_returnsPacket() {
+        String message = "Test server message";
+        Packet packet = PacketCreator.serverMessage(message);
+        assertNotNull(packet);
+    }
+
+    @Test
+    void serverMessage_withNullMessage_returnsPacket() {
+        String message = null;
+        Packet packet = PacketCreator.serverMessage(message);
+        assertNotNull(packet);
+    }
+}
\ No newline at end of file