diff --git a/ummisco.gama.network/src/ummisco/gama/network/common/Connector.java b/ummisco.gama.network/src/ummisco/gama/network/common/Connector.java
index f9e2623f68..61965930ab 100644
--- a/ummisco.gama.network/src/ummisco/gama/network/common/Connector.java
+++ b/ummisco.gama.network/src/ummisco/gama/network/common/Connector.java
@@ -160,10 +160,15 @@ private Map<IAgent, LinkedList<ConnectorMessage>> pushAndFetchthreadSafe(final i
 					return allMessage;
 				}
 				case PUSCH_RECEIVED_MESSAGE_THREAD_SAFE_ACTION: {
-					final ArrayList<IAgent> bb = this.boxFollower.get(groupName);
+					ArrayList<IAgent> bb = this.boxFollower.get(groupName);
+					if (bb == null) {
+						bb = this.boxFollower.get(this.boxFollower.keySet().toArray()[0]);
+					}
 					for (final IAgent agt : bb) {
 						final LinkedList<ConnectorMessage> messages = receivedMessage.get(agt);
-						if (messages != null) { messages.add(message); }
+						if (messages != null) {
+							messages.add(message);
+						}
 					}
 					break;
 				}
diff --git a/ummisco.gama.network/src/ummisco/gama/network/tcp/ServerService.java b/ummisco.gama.network/src/ummisco/gama/network/tcp/ServerService.java
index d1329e227c..f5a4589579 100644
--- a/ummisco.gama.network/src/ummisco/gama/network/tcp/ServerService.java
+++ b/ummisco.gama.network/src/ummisco/gama/network/tcp/ServerService.java
@@ -112,7 +112,7 @@ public void run() {
 				DEBUG.LOG("Socket error" + e1);
 				/// isOnline = false;
 			} catch (final Exception e) {
-				DEBUG.LOG("Exception occured in socket");
+				DEBUG.LOG("Exception occured in socket "+e.getMessage());
 			}
 		}
 	}
diff --git a/ummisco.gama.network/src/ummisco/gama/network/tcp/TCPConnector.java b/ummisco.gama.network/src/ummisco/gama/network/tcp/TCPConnector.java
index ae09ef4c2d..d6845585d8 100644
--- a/ummisco.gama.network/src/ummisco/gama/network/tcp/TCPConnector.java
+++ b/ummisco.gama.network/src/ummisco/gama/network/tcp/TCPConnector.java
@@ -102,7 +102,7 @@ public void receivedMessage(final String sender, final String message) {
 					if (mte.equals(MessageType.COMMAND_MESSAGE)) {
 						extractAndApplyCommand(sender, message);
 					} else {
-						final String r = MessageFactory.unpackReceiverName(message);
+						final String r = isRaw ? message : MessageFactory.unpackReceiverName(message);
 						storeMessage(r, message);
 					}
 				}