3 files changed, 6 insertions, 5 deletions
diff --git a/src/main/java/org/openslx/util/Util.java b/src/main/java/org/openslx/util/Util.java
index d8048cd..441bc88 100644
--- a/src/main/java/org/openslx/util/Util.java
+++ b/src/main/java/org/openslx/util/Util.java
@@ -25,7 +25,7 @@ public class Util
 		if ( something == null ) {
 			if ( message != null )
 				log.fatal( "[NOTNULL] " + message );
-			log.warn( Thread.currentThread().getStackTrace().toString() );
+			log.warn( "Fatal null pointer exception", new NullPointerException() );
 			System.exit( 2 );
 		}
 	}
@@ -61,7 +61,7 @@ public class Util
 		if ( isEmptyString( something ) ) {
 			if ( message != null )
 				log.fatal( "[NOTNULL] " + message );
-			log.warn( Thread.currentThread().getStackTrace().toString() );
+			log.warn( "Fatal null pointer or empty exception", new NullPointerException() );
 			System.exit( 2 );
 		}
 	}
diff --git a/src/main/java/org/openslx/util/vm/QemuMetaData.java b/src/main/java/org/openslx/util/vm/QemuMetaData.java
index 742fa40..ad02a96 100644
--- a/src/main/java/org/openslx/util/vm/QemuMetaData.java
+++ b/src/main/java/org/openslx/util/vm/QemuMetaData.java
@@ -14,9 +14,9 @@ import org.openslx.thrifthelper.TConst;
 public class QemuMetaData extends VmMetaData<VBoxSoundCardMeta, VBoxDDAccelMeta, VBoxHWVersionMeta, VBoxEthernetDevTypeMeta>
 {
 
-	private Map<String, String> arguments = new HashMap<String, String>();
+	private final Map<String, String> arguments = new HashMap<String, String>();
 	// the above map's elements will take the place of <args> in the config string
-	private static String config = "qemu-system-i386 <args> <image> -enable-kvm \n\r qemu-system-x86_64 <args> <image> -enable-kvm";
+	private String config;
 	private static final Logger LOGGER = Logger.getLogger( QemuMetaData.class );
 
 	private static final Virtualizer virtualizer = new Virtualizer( TConst.VIRT_QEMU, "QEMU-KVM" );
@@ -24,6 +24,7 @@ public class QemuMetaData extends VmMetaData<VBoxSoundCardMeta, VBoxDDAccelMeta,
 	public QemuMetaData( List<OperatingSystem> osList, File file )
 	{
 		super( osList );
+		config = "qemu-system-i386 <args> <image> -enable-kvm \n\r qemu-system-x86_64 <args> <image> -enable-kvm";
 		displayName = file.getName().substring( 0, file.getName().indexOf( "." ) );
 		setOs( "anyOs" );
 		hdds.add( new HardDisk( "anychipset", DriveBusType.IDE, file.getAbsolutePath() ) );
diff --git a/src/main/java/org/openslx/util/vm/VmwareConfig.java b/src/main/java/org/openslx/util/vm/VmwareConfig.java
index ac13e4f..20ab3ab 100644
--- a/src/main/java/org/openslx/util/vm/VmwareConfig.java
+++ b/src/main/java/org/openslx/util/vm/VmwareConfig.java
@@ -125,7 +125,7 @@ public class VmwareConfig
 			ret = ret.replace( "|22", "\"" );
 		}
 		if ( ret.contains( "|7C" ) ) {
-			ret.replace( "|7C", "|" );
+			ret = ret.replace( "|7C", "|" );
 		}
 		return ret;
 	}