diff --git a/assets/js/src/newsletter_editor/components/save.js b/assets/js/src/newsletter_editor/components/save.js
index 6382a833fe..196d34ff33 100644
--- a/assets/js/src/newsletter_editor/components/save.js
+++ b/assets/js/src/newsletter_editor/components/save.js
@@ -1,12 +1,13 @@
 define([
     'newsletter_editor/App',
     'mailpoet',
+    'notice',
     'backbone',
     'backbone.marionette',
     'jquery',
     'blob',
     'filesaver'
-  ], function(App, MailPoet, Backbone, Marionette, jQuery, Blob, FileSaver) {
+  ], function(App, MailPoet, Notice, Backbone, Marionette, jQuery, Blob, FileSaver) {
 
   "use strict";
 
@@ -144,12 +145,18 @@ define([
       var templateName = this.$('.mailpoet_export_template_name').val(),
           templateDescription = this.$('.mailpoet_export_template_description').val();
 
-      console.log('Exporting template with ', templateName, templateDescription);
-      Module.exportTemplate({
-        name: templateName,
-        description: templateDescription,
-      });
-      this.hideExportTemplate();
+      if (templateName === '') {
+        MailPoet.Notice.error(App.getConfig().get('translations.templateNameMissing'));
+      } else if (templateDescription === '') {
+        MailPoet.Notice.error(App.getConfig().get('translations.templateDescriptionMissing'));
+      } else {
+        console.log('Exporting template with ', templateName, templateDescription);
+        Module.exportTemplate({
+          name: templateName,
+          description: templateDescription,
+        });
+        this.hideExportTemplate();
+      }
     },
     hideOptionContents: function() {
       this.hideSaveAsTemplate();
diff --git a/views/newsletter/form.html b/views/newsletter/form.html
index e6125c9ad9..373041aa00 100644
--- a/views/newsletter/form.html
+++ b/views/newsletter/form.html
@@ -1239,6 +1239,10 @@
           '<%= __('Test email successfully sent!') %>',
         unknownErrorOccurred:
           '<%= __('An unknown error occurred, please check your settings.') %>',
+        templateNameMissing:
+          '<%= __('Please add a template name') %>',
+        templateDescriptionMissing:
+          '<%= __('Please add a template description') %>',
       },
       sidepanelWidth: '331px',
       validation: {