diff --git a/solr/core/src/java/org/apache/solr/util/SolrLogLayout.java b/solr/core/src/java/org/apache/solr/util/SolrLogLayout.java
index 4fc04e93216..6b6d011acf3 100644
--- a/solr/core/src/java/org/apache/solr/util/SolrLogLayout.java
+++ b/solr/core/src/java/org/apache/solr/util/SolrLogLayout.java
@@ -112,7 +112,9 @@ public class SolrLogLayout extends Layout {
   
   public String _format(LoggingEvent event) {
     String message = (String) event.getMessage();
-    
+    if (message == null) {
+      message = "";
+    }
     StringBuilder sb = new StringBuilder(message.length() + 80);
     
     long now = event.timeStamp;