diff --git a/src/explorviz/live_trace_processing/reader/TCPReaderOneClient.java b/src/explorviz/live_trace_processing/reader/TCPReaderOneClient.java
index 6119d5757d61d05129e4c56b52f9895cf36d8faa..0d9890923ee3efee215c2009d3630c8f90a634ff 100644
--- a/src/explorviz/live_trace_processing/reader/TCPReaderOneClient.java
+++ b/src/explorviz/live_trace_processing/reader/TCPReaderOneClient.java
@@ -888,19 +888,21 @@ class TCPReaderOneClient extends Thread {
 		buffer.position(buffer.position() - length);
 		buffer.get(message);
 		waitingForStringMessages.add(message);
-		System.out.println("waitingForStringMessages :" + waitingForStringMessages.size());
 	}
 
 	private final void checkWaitingMessages() {
-		final List<byte[]> localWaitingList = new ArrayList<byte[]>();
-		for (final byte[] waitingMessage : waitingForStringMessages) {
-			localWaitingList.add(waitingMessage);
+		if (waitingForStringMessages.isEmpty()) {
+			return;
 		}
+
+		System.out.println("waitingForStringMessages: " + waitingForStringMessages.size());
+		final List<byte[]> localWaitingList = new ArrayList<byte[]>(waitingForStringMessages);
 		waitingForStringMessages.clear();
 
 		for (final byte[] waitingMessage : localWaitingList) {
 			final ByteBuffer buffer = ByteBuffer.wrap(waitingMessage);
 			final byte waitingMessageClazzId = buffer.get();
+			System.out.println("waitingForStringMessages clazzId: " + waitingMessageClazzId);
 			switch (waitingMessageClazzId) {
 				case HostApplicationMetaDataRecord.CLAZZ_ID:
 					readInHostApplicationMetaData(buffer);