diff --git a/protocol/src/main/resources/cpp/ByteBuffer.h b/protocol/src/main/resources/cpp/ByteBuffer.h
index 52d69bb0e..c1eae9d10 100644
--- a/protocol/src/main/resources/cpp/ByteBuffer.h
+++ b/protocol/src/main/resources/cpp/ByteBuffer.h
@@ -123,7 +123,7 @@ namespace zfoo {
                         "writeIndex[" + std::to_string(writeIndex) + "] out of bounds exception: readOffset: " +
                         std::to_string(readOffset) +
                         ", writeOffset: " + std::to_string(writeOffset) +
-                        "(expected: 0 <= readOffset <= writeOffset <= capacity:" + std::to_string(max_capacity);
+                        "(expected: 0 <= readOffset <= writeOffset <= capacity:" + std::to_string(max_capacity)  + ")";
                 throw errorMessage;
             }
             writeOffset = writeIndex;
@@ -135,7 +135,7 @@ namespace zfoo {
                         "readIndex[" + std::to_string(readIndex) + "] out of bounds exception: readOffset: " +
                         std::to_string(readOffset) +
                         ", writeOffset: " + std::to_string(writeOffset) +
-                        "(expected: 0 <= readOffset <= writeOffset <= capacity:" + std::to_string(max_capacity);
+                        "(expected: 0 <= readOffset <= writeOffset <= capacity:" + std::to_string(max_capacity)  + ")";
                 throw errorMessage;
             }
             readOffset = readIndex;
diff --git a/protocol/src/main/resources/csharp/Buffer/ByteBuffer.cs b/protocol/src/main/resources/csharp/Buffer/ByteBuffer.cs
index a231ada00..f8bc3d1e4 100644
--- a/protocol/src/main/resources/csharp/Buffer/ByteBuffer.cs
+++ b/protocol/src/main/resources/csharp/Buffer/ByteBuffer.cs
@@ -92,7 +92,7 @@ public void SetWriteOffset(int writeIndex)
                 throw new Exception("writeIndex[" + writeIndex + "] out of bounds exception: readOffset: " +
                                     readOffset +
                                     ", writeOffset: " + writeOffset +
-                                    "(expected: 0 <= readOffset <= writeOffset <= capacity:" + buffer.Length);
+                                    "(expected: 0 <= readOffset <= writeOffset <= capacity:" + buffer.Length) + ")";
             }
             writeOffset = writeIndex;
         }
@@ -108,7 +108,7 @@ public void SetReadOffset(int readIndex)
             {
                 throw new Exception("readIndex[" + readIndex + "] out of bounds exception: readIndex: " + readOffset +
                                     ", writeOffset: " + writeOffset +
-                                    "(expected: 0 <= readOffset <= writeOffset <= capacity:" + buffer.Length);
+                                    "(expected: 0 <= readOffset <= writeOffset <= capacity:" + buffer.Length) + ")";
             }
             readOffset = readIndex;
         }
diff --git a/protocol/src/main/resources/ecmascript/buffer/ByteBuffer.mjs b/protocol/src/main/resources/ecmascript/buffer/ByteBuffer.mjs
index 48cd660f1..e8f109c72 100644
--- a/protocol/src/main/resources/ecmascript/buffer/ByteBuffer.mjs
+++ b/protocol/src/main/resources/ecmascript/buffer/ByteBuffer.mjs
@@ -83,26 +83,26 @@ class ByteBuffer {
         return this.writeOffset;
     }
 
-    setWriteOffset(writeOffset) {
-        if (writeOffset > this.buffer.byteLength) {
-            throw new Error('index out of bounds exception: readerIndex: ' + this.readOffset +
-            ', writerIndex: ' + this.writeOffset +
-            '(expected: 0 <= readerIndex <= writerIndex <= capacity:' + this.buffer.byteLength);
+    setWriteOffset(writeIndex) {
+        if (writeIndex > this.buffer.byteLength) {
+            throw new Error('writeIndex out of bounds exception: readOffset: ' + this.readOffset +
+            ', writeOffset: ' + this.writeOffset +
+            '(expected: 0 <= readOffset <= writeOffset <= capacity:' + this.buffer.byteLength) + ')';
         }
-        this.writeOffset = writeOffset;
+        this.writeOffset = writeIndex;
     }
 
     getReadOffset() {
         return this.readOffset;
     }
 
-    setReadOffset(readOffset) {
-        if (readOffset > this.writeOffset) {
-            throw new Error('index out of bounds exception: readerIndex: ' + this.readOffset +
-                ', writerIndex: ' + this.writeOffset +
-                '(expected: 0 <= readerIndex <= writerIndex <= capacity:' + this.buffer.byteLength);
+    setReadOffset(readIndex) {
+        if (readIndex > this.writeOffset) {
+            throw new Error('readIndex out of bounds exception: readOffset: ' + this.readOffset +
+                ', writeOffset: ' + this.writeOffset +
+                '(expected: 0 <= readOffset <= writeOffset <= capacity:' + this.buffer.byteLength) + ")";
         }
-        this.readOffset = readOffset;
+        this.readOffset = readIndex;
     }
 
     getCapacity() {
diff --git a/protocol/src/main/resources/javascript/buffer/ByteBuffer.js b/protocol/src/main/resources/javascript/buffer/ByteBuffer.js
index c15b1d39e..2ecf9a469 100644
--- a/protocol/src/main/resources/javascript/buffer/ByteBuffer.js
+++ b/protocol/src/main/resources/javascript/buffer/ByteBuffer.js
@@ -100,7 +100,7 @@ const ByteBuffer = function() {
         if (writeIndex > this.buffer.byteLength) {
             throw new Error('writeIndex out of bounds exception: readOffset: ' + this.readOffset +
             ', writeOffset: ' + this.writeOffset +
-            '(expected: 0 <= readOffset <= writeOffset <= capacity:' + this.buffer.byteLength);
+            '(expected: 0 <= readOffset <= writeOffset <= capacity:' + this.buffer.byteLength) + ')';
         }
         this.writeOffset = writeIndex;
     };
@@ -113,7 +113,7 @@ const ByteBuffer = function() {
         if (readIndex > this.writeOffset) {
             throw new Error('readIndex out of bounds exception: readOffset: ' + this.readOffset +
                 ', writeOffset: ' + this.writeOffset +
-                '(expected: 0 <= readOffset <= writeOffset <= capacity:' + this.buffer.byteLength);
+                '(expected: 0 <= readOffset <= writeOffset <= capacity:' + this.buffer.byteLength) + ')';
         }
         this.readOffset = readIndex;
     };
diff --git a/protocol/src/test/javascript/zfoojs/buffer/ByteBuffer.js b/protocol/src/test/javascript/zfoojs/buffer/ByteBuffer.js
index c15b1d39e..2ecf9a469 100644
--- a/protocol/src/test/javascript/zfoojs/buffer/ByteBuffer.js
+++ b/protocol/src/test/javascript/zfoojs/buffer/ByteBuffer.js
@@ -100,7 +100,7 @@ const ByteBuffer = function() {
         if (writeIndex > this.buffer.byteLength) {
             throw new Error('writeIndex out of bounds exception: readOffset: ' + this.readOffset +
             ', writeOffset: ' + this.writeOffset +
-            '(expected: 0 <= readOffset <= writeOffset <= capacity:' + this.buffer.byteLength);
+            '(expected: 0 <= readOffset <= writeOffset <= capacity:' + this.buffer.byteLength) + ')';
         }
         this.writeOffset = writeIndex;
     };
@@ -113,7 +113,7 @@ const ByteBuffer = function() {
         if (readIndex > this.writeOffset) {
             throw new Error('readIndex out of bounds exception: readOffset: ' + this.readOffset +
                 ', writeOffset: ' + this.writeOffset +
-                '(expected: 0 <= readOffset <= writeOffset <= capacity:' + this.buffer.byteLength);
+                '(expected: 0 <= readOffset <= writeOffset <= capacity:' + this.buffer.byteLength) + ')';
         }
         this.readOffset = readIndex;
     };