diff --git a/apps/documenteditor/main/app/view/WatermarkSettingsDialog.js b/apps/documenteditor/main/app/view/WatermarkSettingsDialog.js
index 495ef6850d..e0583d77a7 100644
--- a/apps/documenteditor/main/app/view/WatermarkSettingsDialog.js
+++ b/apps/documenteditor/main/app/view/WatermarkSettingsDialog.js
@@ -464,7 +464,7 @@ define(['text!documenteditor/main/app/template/WatermarkSettings.template',
                 data.push({value: item});
             });
             this.cmbText.setData(data);
-            this.cmbText.setValue(data[0].value);
+            (data.length>0) && this.cmbText.setValue(data[0].value);
         },
 
         insertFromUrl: function() {
diff --git a/build/documenteditor.json b/build/documenteditor.json
index 50a89586ec..0bdc55f0a9 100644
--- a/build/documenteditor.json
+++ b/build/documenteditor.json
@@ -145,6 +145,12 @@
                     "cwd": "../apps/documenteditor/main/locale/",
                     "src": "*",
                     "dest": "../deploy/web-apps/apps/documenteditor/main/locale/"
+                },
+                {
+                    "expand": true,
+                    "cwd": "../apps/documenteditor/main/resources/watermark",
+                    "src": "*",
+                    "dest": "../deploy/web-apps/apps/documenteditor/main/resources/watermark"
                 }
             ],
             "help": [
@@ -389,10 +395,10 @@
         "copy": {
             "localization": [
                 {
-                  "expand": true,
-                  "cwd": "../apps/documenteditor/embed/locale/",
-                  "src": "*",
-                  "dest": "../deploy/web-apps/apps/documenteditor/embed/locale/"
+                    "expand": true,
+                    "cwd": "../apps/documenteditor/embed/locale/",
+                    "src": "*",
+                    "dest": "../deploy/web-apps/apps/documenteditor/embed/locale/"
                 }
             ],
             "index-page": {