diff --git a/src/com/projectswg/networking/client/ClientData.java b/src/com/projectswg/networking/client/ClientData.java
index 30abf78..9e78859 100644
--- a/src/com/projectswg/networking/client/ClientData.java
+++ b/src/com/projectswg/networking/client/ClientData.java
@@ -23,7 +23,7 @@ public class ClientData {
 		setTxSequence((short) 0);
 		setAckSequence((short) 0);
 		setOOOSequence((short) 0);
-		setClientServer(ClientServer.LOGIN);
+		setClientServer(ClientServer.NONE);
 	}
 	
 	public int getConnectionId() {
diff --git a/src/com/projectswg/networking/client/ClientProcessor.java b/src/com/projectswg/networking/client/ClientProcessor.java
index f06587a..6dd14c7 100644
--- a/src/com/projectswg/networking/client/ClientProcessor.java
+++ b/src/com/projectswg/networking/client/ClientProcessor.java
@@ -15,7 +15,6 @@ import com.projectswg.networking.Packet;
 import com.projectswg.networking.client.ClientServerSocket.IncomingPacket;
 import com.projectswg.networking.client.sender.PacketResender;
 import com.projectswg.networking.soe.*;
-import com.projectswg.networking.soe.Disconnect.DisconnectReason;
 import com.projectswg.resources.ClientConnectionStatus;
 import com.projectswg.utilities.ByteUtilities;
 import com.projectswg.utilities.Log;
@@ -134,12 +133,18 @@ public class ClientProcessor {
 	}
 	
 	private void handlePacket(IncomingPacket incoming, Packet p) {
-		if (p instanceof SessionRequest)
+		if (p instanceof SessionRequest) {
 			onSessionRequest(incoming, (SessionRequest) p);
-		else if (p instanceof MultiPacket)
+			return;
+		}
+		if (incoming.getPort() != data.getCommunicationPort()) {
+			Log.out(this, "Dropping packet on floor - not a valid port! Expected: %d  Actual: %d", data.getCommunicationPort(), incoming.getPort());
+			return;
+		}
+		if (p instanceof MultiPacket)
 			onMultiPacket(incoming, (MultiPacket) p);
 		else if (p instanceof Disconnect)
-			onDisconnect((Disconnect) p);
+			onDisconnect(incoming, (Disconnect) p);
 		else if (p instanceof KeepAlive)
 			onKeepAlive((KeepAlive) p);
 		else if (p instanceof ClientNetworkStatusUpdate)
@@ -157,9 +162,10 @@ public class ClientProcessor {
 	}
 	
 	private void onSessionRequest(IncomingPacket incoming, SessionRequest request) {
-		int oldId = data.getConnectionId();
-		if (oldId != -1)
-			packetSender.sendRaw(new Disconnect(oldId, DisconnectReason.APPLICATION));
+		if (data.getConnectionId() == request.getConnectionId() || data.getClientServer() == incoming.getServer()) {
+			Log.out(this, "Dropping connection request! Has same ID or using same server");
+			return;
+		}
 		switch (incoming.getServer()) {
 			case LOGIN:
 				Log.out(this, "Login Session Request [port set to %d]", incoming.getPort());
@@ -187,8 +193,8 @@ public class ClientProcessor {
 		}
 	}
 	
-	private void onDisconnect(Disconnect disconnect) {
-		Log.out(this, "Received client disconnect");
+	private void onDisconnect(IncomingPacket incoming, Disconnect disconnect) {
+		Log.out(this, "Received client disconnect [port=%d reason=%s]", incoming.getPort(), disconnect.getReason());
 		setConnectionState(ClientConnectionStatus.DISCONNECTED);
 	}
 	
diff --git a/src/com/projectswg/networking/client/ClientServerSocket.java b/src/com/projectswg/networking/client/ClientServerSocket.java
index b261136..f2e5098 100644
--- a/src/com/projectswg/networking/client/ClientServerSocket.java
+++ b/src/com/projectswg/networking/client/ClientServerSocket.java
@@ -62,12 +62,16 @@ public class ClientServerSocket {
 	}
 	
 	public void send(byte [] packet) {
+		if (data.getClientServer() == ClientServer.NONE)
+			return;
 		Assert.test(packet.length > 0, "Packet length cannot be 0!");
 		Assert.test(data.getCommunicationPort() > 0, "Communication port has not been set!");
 		getServer().send(data.getCommunicationPort(), ADDR, packet);
 	}
 	
 	public void send(DatagramPacket packet) {
+		if (data.getClientServer() == ClientServer.NONE)
+			return;
 		Assert.test(packet.getLength() > 0, "Packet length cannot be 0!");
 		Assert.test(packet.getData().length == packet.getLength(), "Data length and packet length do not match!");
 		getServer().send(packet);
@@ -105,6 +109,7 @@ public class ClientServerSocket {
 	}
 	
 	public enum ClientServer {
+		NONE,
 		LOGIN,
 		ZONE
 	}