diff --git a/src/Config.py b/src/Config.py
index 2bd9c44b..0d378cdb 100644
--- a/src/Config.py
+++ b/src/Config.py
@@ -13,7 +13,7 @@ class Config(object):
 
     def __init__(self, argv):
         self.version = "0.7.1"
-        self.rev = 4473
+        self.rev = 4478
         self.argv = argv
         self.action = None
         self.test_parser = None
diff --git a/src/Ui/UiWebsocket.py b/src/Ui/UiWebsocket.py
index 7fce398b..cbc3b8fe 100644
--- a/src/Ui/UiWebsocket.py
+++ b/src/Ui/UiWebsocket.py
@@ -1041,6 +1041,9 @@ class UiWebsocket(object):
 
         inner_paths = [content_inner_path] + list(content.get("includes", {}).keys()) + list(content.get("files", {}).keys())
 
+        if len(inner_paths) > 100:
+            return {"error": "Too many files in content.json"}
+
         for relative_inner_path in inner_paths:
             inner_path = helper.getDirname(content_inner_path) + relative_inner_path
             try:
diff --git a/src/Ui/media/Wrapper.coffee b/src/Ui/media/Wrapper.coffee
index cecd1bc6..dceb4f57 100644
--- a/src/Ui/media/Wrapper.coffee
+++ b/src/Ui/media/Wrapper.coffee
@@ -623,7 +623,7 @@ class Wrapper
 
 	updateModifiedPanel: =>
 		@ws.cmd "siteListModifiedFiles", [], (res) =>
-			num = res.modified_files.length
+			num = res.modified_files?.length
 			if num > 0
 				closed = @site_info.settings.modified_files_notification == false
 				@infopanel.show(closed)
@@ -642,8 +642,7 @@ class Wrapper
 							@notifications.add "sign", "done", "content.json Signed!", 5000
 							@sitePublish("content.json")
 					return false
-
-			@log "siteListModifiedFiles", res
+			@log "siteListModifiedFiles", num, res
 
 	setAnnouncerInfo: (announcer_info) ->
 		status_db = {announcing: [], error: [], announced: []}
diff --git a/src/Ui/media/all.js b/src/Ui/media/all.js
index eb3dc905..f1eebe84 100644
--- a/src/Ui/media/all.js
+++ b/src/Ui/media/all.js
@@ -1856,8 +1856,8 @@ $.extend( $.easing,
     Wrapper.prototype.updateModifiedPanel = function() {
       return this.ws.cmd("siteListModifiedFiles", [], (function(_this) {
         return function(res) {
-          var closed, num;
-          num = res.modified_files.length;
+          var closed, num, ref;
+          num = (ref = res.modified_files) != null ? ref.length : void 0;
           if (num > 0) {
             closed = _this.site_info.settings.modified_files_notification === false;
             _this.infopanel.show(closed);
@@ -1877,7 +1877,8 @@ $.extend( $.easing,
               return false;
             });
           }
-          return _this.log("siteListModifiedFiles", res);
+          debugger;
+          return _this.log("siteListModifiedFiles", num, res);
         };
       })(this));
     };