diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 923129e7495..0f592e295db 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -44,6 +44,9 @@ Optimizations
 Bug Fixes
 ----------------------
 
+* SOLR-3560: Handle different types of Exception Messages for Logging UI
+  (steffkes)
+
 Other Changes
 ----------------------
 
diff --git a/solr/webapp/web/js/scripts/logging.js b/solr/webapp/web/js/scripts/logging.js
index a84e8382472..be779b6f7ec 100644
--- a/solr/webapp/web/js/scripts/logging.js
+++ b/solr/webapp/web/js/scripts/logging.js
@@ -317,6 +317,18 @@ var load_logging_viewer = function()
         for( var i = 0; i < docs_count; i++ )
         {
           var doc = docs[i];
+
+          if( !doc.trace )
+          {
+            var lines = doc.message.split( "\n" );
+            if( 1 < lines.length )
+            {
+              doc.message = lines[0];
+              doc.trace = doc.message;
+              delete lines;
+            }
+          }
+
           var has_trace = 'undefined' !== typeof( doc.trace );
 
           doc.logger = '<abbr title="' + doc.logger.esc() + '">' + doc.logger.split( '.' ).pop().esc() + '</abbr>';