diff --git a/src/protocol/swg/CollectionServerFirstListRequest.java b/src/protocol/swg/CollectionServerFirstListRequest.java
index d22ef081..cc053664 100644
--- a/src/protocol/swg/CollectionServerFirstListRequest.java
+++ b/src/protocol/swg/CollectionServerFirstListRequest.java
@@ -32,6 +32,8 @@ public class CollectionServerFirstListRequest extends SWGMessage {
 
 	@Override
 	public void deserialize(IoBuffer data) {
+		data.getShort();
+		data.getInt();
 		setServer(getAsciiString(data));
 	}
 
diff --git a/src/services/PlayerService.java b/src/services/PlayerService.java
index 1f2a7b6c..5c6f5982 100644
--- a/src/services/PlayerService.java
+++ b/src/services/PlayerService.java
@@ -396,7 +396,8 @@ public class PlayerService implements INetworkDispatch {
 			@Override
 			public void handlePacket(IoSession session, IoBuffer data) throws Exception {
 				data.order(ByteOrder.LITTLE_ENDIAN);
-				
+				data.position(0);
+
 				Client client = core.getClient(session);
 				
 				if (client == null)
@@ -409,8 +410,13 @@ public class PlayerService implements INetworkDispatch {
 				
 				CollectionServerFirstListRequest request = new CollectionServerFirstListRequest();
 				request.deserialize(data);
+				
+				String server = request.getServer();
+				System.out.println(server);
+				if (server == null || server.equals(""))
+					return;
 
-				CollectionServerFirstListResponse response = new CollectionServerFirstListResponse(request.getServer(), core.guildService.getGuildObject().getServerFirst());
+				CollectionServerFirstListResponse response = new CollectionServerFirstListResponse(server, core.guildService.getGuildObject().getServerFirst());
 				session.write(response.serialize());
 			}