diff --git a/tools/editor/editor_settings.cpp b/tools/editor/editor_settings.cpp
index 9a4505efedd..f49d3b496d4 100644
--- a/tools/editor/editor_settings.cpp
+++ b/tools/editor/editor_settings.cpp
@@ -264,6 +264,7 @@ void EditorSettings::create() {
 
 	singleton = Ref<EditorSettings>( memnew( EditorSettings ) );
 	singleton->config_file_path=config_file_path;
+	singleton->settings_path=config_path+"/"+config_dir;
 	singleton->_load_defaults();
 	singleton->scan_plugins();
 
diff --git a/tools/editor/project_export.cpp b/tools/editor/project_export.cpp
index 63187d29039..374dda852ba 100644
--- a/tools/editor/project_export.cpp
+++ b/tools/editor/project_export.cpp
@@ -479,6 +479,11 @@ Error ProjectExportDialog::export_platform(const String& p_platform, const Strin
 	if (err!=OK) {
 		error->set_text("Error exporting project!");
 		error->popup_centered_minsize();
+		ERR_PRINT("Exporting failed!");
+		if (p_quit_after) {
+			OS::get_singleton()->set_exit_code(255);
+			get_tree()->quit();
+		}
 		return ERR_CANT_CREATE;
 	} else {
 		if (p_quit_after) {