diff --git a/Mage.Server/src/main/java/mage/server/util/ServerMessagesUtil.java b/Mage.Server/src/main/java/mage/server/util/ServerMessagesUtil.java
index 4f5f40e2fd9..c0703bf5871 100644
--- a/Mage.Server/src/main/java/mage/server/util/ServerMessagesUtil.java
+++ b/Mage.Server/src/main/java/mage/server/util/ServerMessagesUtil.java
@@ -92,7 +92,9 @@ public class ServerMessagesUtil {
         List<String> motdMessages = readFromFile();
         List<String> newMessages = new ArrayList<String>();
         newMessages.add(getServerStatistics());
-        newMessages.addAll(motdMessages);
+        if (motdMessages != null) {
+            newMessages.addAll(motdMessages);
+        }
 
         lock.writeLock().lock();
         try {