From e97d655bd1d9be5ab17127a4664f74130bf08bfb Mon Sep 17 00:00:00 2001
From: magenoxx <magenoxx@gmail>
Date: Thu, 27 Oct 2011 12:28:36 +0400
Subject: [PATCH] Fixed Issue 339.

---
 .../src/main/java/mage/server/util/ServerMessagesUtil.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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 {