diff --git a/node_modules/ace_tree/lib/ace_tree/layer/cells.js b/node_modules/ace_tree/lib/ace_tree/layer/cells.js
index 9a25c4f8..c0eeffeb 100644
--- a/node_modules/ace_tree/lib/ace_tree/layer/cells.js
+++ b/node_modules/ace_tree/lib/ace_tree/layer/cells.js
@@ -51,7 +51,7 @@ var Cells = function(parentEl) {
             this.$renderRow(html, datarow, vsize, hsize, row);
         }
         
-        if (firstRow === 0 && lastRow === 0) {
+        if (firstRow <= 0 && lastRow <= 0) {
             this.renderPlaceHolder(provider, html, config);
         }
         
@@ -130,7 +130,7 @@ var Cells = function(parentEl) {
            provider.renderRow(row, html, config);
         }
         
-        if (firstRow === 0 && lastRow === 0) {
+        if (firstRow <= 0 && lastRow <= 0) {
             this.renderPlaceHolder(provider, html, config);
         }
         
@@ -187,7 +187,7 @@ var Cells = function(parentEl) {
         } else if (provider.getEmptyMessage) {
             html.push(
                 "<div class='message empty'>",
-                    provider.getEmptyMessage(),
+                    escapeHTML(provider.getEmptyMessage()),
                 "</div>"
             );
         }