Index: java/installer2/src/net/oni2/aeinstaller/backend/oni/management/Installer.java
===================================================================
--- java/installer2/src/net/oni2/aeinstaller/backend/oni/management/Installer.java	(revision 937)
+++ java/installer2/src/net/oni2/aeinstaller/backend/oni/management/Installer.java	(revision 988)
@@ -4,8 +4,11 @@
 import java.io.FileFilter;
 import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
 import java.io.FilenameFilter;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
+import java.io.UnsupportedEncodingException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -22,4 +25,5 @@
 import net.oni2.aeinstaller.backend.CaseInsensitiveFile;
 import net.oni2.aeinstaller.backend.Paths;
+import net.oni2.aeinstaller.backend.RuntimeOptions;
 import net.oni2.aeinstaller.backend.oni.OniSplit;
 import net.oni2.aeinstaller.backend.oni.PersistDat;
@@ -485,6 +489,9 @@
 			PrintWriter masterpatchWriter = null;
 			try {
-				masterpatchWriter = new PrintWriter(masterpatch);
+				masterpatchWriter = new PrintWriter(new OutputStreamWriter(
+						new FileOutputStream(masterpatch), "UTF-8"));
 			} catch (FileNotFoundException e) {
+				e.printStackTrace();
+			} catch (UnsupportedEncodingException e) {
 				e.printStackTrace();
 			}
@@ -502,5 +509,5 @@
 			// Apply patches through masterpatch in levelFolderXML
 			res = XMLTools.patch(masterpatch);
-			log.logAppOutput(res, false);
+			log.logAppOutput(res, true);
 
 			// Create .oni files from XML
@@ -510,9 +517,11 @@
 			log.logAppOutput(res, true);
 
-			// Remove XML folder as import will only require .oni's
-			try {
-				FileUtils.deleteDirectory(levelFolderXML);
-			} catch (IOException e) {
-				e.printStackTrace();
+			if (!RuntimeOptions.isDebug()) {
+				// Remove XML folder as import will only require .oni's
+				try {
+					FileUtils.deleteDirectory(levelFolderXML);
+				} catch (IOException e) {
+					e.printStackTrace();
+				}
 			}
 
Index: java/installer2/src/net/oni2/aeinstaller/backend/oni/management/Logger.java
===================================================================
--- java/installer2/src/net/oni2/aeinstaller/backend/oni/management/Logger.java	(revision 937)
+++ java/installer2/src/net/oni2/aeinstaller/backend/oni/management/Logger.java	(revision 988)
@@ -81,4 +81,6 @@
 			log.println("\t\t\tDuration: " + result.time + " ms");
 			log.println();
+		} else {
+			log.println("\t\t\tExecution of external tool failed.");
 		}
 	}