diff --git a/src/main/java/net/openhft/chronicle/map/StatelessChronicleMap.java b/src/main/java/net/openhft/chronicle/map/StatelessChronicleMap.java
index 560a99e11..cac217910 100644
--- a/src/main/java/net/openhft/chronicle/map/StatelessChronicleMap.java
+++ b/src/main/java/net/openhft/chronicle/map/StatelessChronicleMap.java
@@ -503,9 +503,6 @@ class StatelessChronicleMap<K, V> implements ChronicleMap<K, V>, Closeable {
         in.clear();
         in.buffer().clear();
 
-       /* in.buffer().limit(in.buffer().capacity());
-        in.limit(in.buffer().position());
-*/
         // read size
         while (in.buffer().position() < 2) {
             clientChannel.read(in.buffer());
@@ -527,20 +524,12 @@ class StatelessChronicleMap<K, V> implements ChronicleMap<K, V>, Closeable {
 
         long inTransactionId = in.readLong();
 
-        if (inTransactionId != transactionId) {
+        if (inTransactionId != transactionId)
             throw new IllegalStateException("the received transaction-id=" + inTransactionId +
                     ", does not match the expected transaction-id=" + transactionId);
-        }
 
-        if (isException) {
-            int len = in.readUnsignedShort();
-
-            in.limit(in.position() + len);
-
-            Object o = in.readObject();
-            RuntimeException runtimeException = (RuntimeException) o;
-            throw runtimeException;
-        }
+        if (isException)
+            throw (RuntimeException) in.readObject();
 
         return in;
     }
diff --git a/src/main/java/net/openhft/chronicle/map/TcpReplicator.java b/src/main/java/net/openhft/chronicle/map/TcpReplicator.java
index dfd98d705..4fe272d9d 100644
--- a/src/main/java/net/openhft/chronicle/map/TcpReplicator.java
+++ b/src/main/java/net/openhft/chronicle/map/TcpReplicator.java
@@ -1588,12 +1588,7 @@ class StatelessServerConnector<K, V> {
     }
 
     private void writeException(RuntimeException e, Bytes out) {
-
-        long start = out.position();
-        out.skip(2);
         out.writeObject(e);
-        long len = out.position() - (start + 2L);
-        out.writeUnsignedShort(start, (int) len);
     }