diff --git a/client/src/client/Client.java b/client/src/client/Client.java
index 9ae4f1f..082184b 100755
--- a/client/src/client/Client.java
+++ b/client/src/client/Client.java
@@ -1613,6 +1613,7 @@ public class Client implements IThreadListener {
             }
             catch (Exception exception)
             {
+				Log.SYSTEM.error(exception, "Fehler beim sofortigen Ausführen von Render-Task " + callableToSchedule);
                 return Futures.immediateFailedFuture(exception);
             }
         }
@@ -2577,7 +2578,7 @@ public class Client implements IThreadListener {
 				Client.this.soundManager.stopSounds();
 			}
 		});
-    	this.registerDebug(Keysym.Q, "Programm sofort beenden und speichern", new DebugRunner() {
+    	this.registerDebug(Keysym.Q, "Programm sofort beenden und trennen", new DebugRunner() {
 			public void execute(Keysym key) {
 				Client.this.interrupted = true;
 			}
@@ -2617,6 +2618,13 @@ public class Client implements IThreadListener {
 				}
 			}
 		});
+    	this.registerDebug(Keysym.AE, "Programm sofort beenden und server beenden", new DebugRunner() {
+			public void execute(Keysym key) {
+				if(Client.this.player != null)
+					Client.this.player.client.addToSendQueue(new CPacketMessage(CPacketMessage.Type.COMMAND, "shutdown"));
+				Client.this.interrupted = true;
+			}
+		});
     }
     
     private boolean handleDebugKey(Keysym key) {
diff --git a/common/src/common/network/PacketEncoder.java b/common/src/common/network/PacketEncoder.java
index ff7cdbf..fec4859 100755
--- a/common/src/common/network/PacketEncoder.java
+++ b/common/src/common/network/PacketEncoder.java
@@ -22,7 +22,7 @@ public class PacketEncoder extends MessageToByteEncoder<Packet>
 
 //        if (Log.isTraceEnabled())
 //        {
-//        	Log.debug("AUS: [" + p_encode_1_.channel().attr(NetConnection.ATTR_STATE).get() + ":" + integer + "] " + p_encode_2_.getClass().getName());
+//        	Log.SYSTEM.debug("AUS: [" + p_encode_1_.channel().attr(NetConnection.ATTR_STATE).get() + ":" + integer + "] " + p_encode_2_.getClass().getName());
 //        }
 
         if (integer == null)
diff --git a/common/src/common/packet/LPacketLogin.java b/common/src/common/packet/LPacketLogin.java
index 671fca7..997d370 100644
--- a/common/src/common/packet/LPacketLogin.java
+++ b/common/src/common/packet/LPacketLogin.java
@@ -10,9 +10,11 @@ public class LPacketLogin implements Packet<ILoginHandler> {
 	}
 
 	public void readPacketData(PacketBuffer buf) throws IOException {
+		buf.readStringFromBuffer(16);
 	}
 
 	public void writePacketData(PacketBuffer buf) throws IOException {
+		buf.writeString("TESTtestPlceHldr");
 	}
 
 	public void processPacket(ILoginHandler handler) {
diff --git a/server/src/server/Server.java b/server/src/server/Server.java
index 8f54ba4..e7f5598 100755
--- a/server/src/server/Server.java
+++ b/server/src/server/Server.java
@@ -763,6 +763,7 @@ public final class Server implements IThreadListener {
 				return Futures.<V>immediateFuture(callable.call());
 			}
 			catch(Exception exception) {
+				Log.SYSTEM.error(exception, "Fehler beim sofortigen Ausführen von Server-Task " + callable);
 				return Futures.immediateFailedFuture(exception);
 			}
 		}