diff --git a/lib/encoding/int.go b/lib/encoding/int.go
index b5ef82a9b..a0cd4a715 100644
--- a/lib/encoding/int.go
+++ b/lib/encoding/int.go
@@ -517,11 +517,12 @@ func UnmarshalBytes(src []byte) ([]byte, int) {
 	if nSize <= 0 {
 		return nil, 0
 	}
-	src = src[nSize:]
-	if uint64(len(src)) < n {
+	if uint64(nSize)+n > uint64(len(src)) {
 		return nil, 0
 	}
-	return src[:n], nSize + int(n)
+	start := nSize
+	nSize += int(n)
+	return src[start:nSize], nSize
 }
 
 // GetInt64s returns an int64 slice with the given size.
diff --git a/lib/logstorage/block_header.go b/lib/logstorage/block_header.go
index 12011921d..578cae535 100644
--- a/lib/logstorage/block_header.go
+++ b/lib/logstorage/block_header.go
@@ -87,7 +87,7 @@ func (bh *blockHeader) unmarshal(src []byte) ([]byte, error) {
 	// unmarshal bh.uncompressedSizeBytes
 	n, nSize := encoding.UnmarshalVarUint64(src)
 	if nSize <= 0 {
-		return srcOrig, fmt.Errorf("cannot unmarshal uncompressedSizeBytes from uvarint")
+		return srcOrig, fmt.Errorf("cannot unmarshal uncompressedSizeBytes")
 	}
 	src = src[nSize:]
 	bh.uncompressedSizeBytes = n
@@ -95,7 +95,7 @@ func (bh *blockHeader) unmarshal(src []byte) ([]byte, error) {
 	// unmarshal bh.rowsCount
 	n, nSize = encoding.UnmarshalVarUint64(src)
 	if nSize <= 0 {
-		return srcOrig, fmt.Errorf("cannot unmarshal rowsCount from uvarint")
+		return srcOrig, fmt.Errorf("cannot unmarshal rowsCount")
 	}
 	src = src[nSize:]
 	if n > maxRowsPerBlock {
@@ -113,7 +113,7 @@ func (bh *blockHeader) unmarshal(src []byte) ([]byte, error) {
 	// unmarshal columnsHeaderOffset
 	n, nSize = encoding.UnmarshalVarUint64(src)
 	if nSize <= 0 {
-		return srcOrig, fmt.Errorf("cannot unmarshal columnsHeaderOffset from uvarint")
+		return srcOrig, fmt.Errorf("cannot unmarshal columnsHeaderOffset")
 	}
 	src = src[nSize:]
 	bh.columnsHeaderOffset = n
@@ -121,7 +121,7 @@ func (bh *blockHeader) unmarshal(src []byte) ([]byte, error) {
 	// unmarshal columnsHeaderSize
 	n, nSize = encoding.UnmarshalVarUint64(src)
 	if nSize <= 0 {
-		return srcOrig, fmt.Errorf("cannot unmarshal columnsHeaderSize from uvarint")
+		return srcOrig, fmt.Errorf("cannot unmarshal columnsHeaderSize")
 	}
 	src = src[nSize:]
 	if n > maxColumnsHeaderSize {
@@ -298,12 +298,13 @@ func (csh *columnsHeader) unmarshal(a *arena, src []byte) error {
 	// unmarshal columnHeaders
 	n, nSize := encoding.UnmarshalVarUint64(src)
 	if nSize <= 0 {
-		return fmt.Errorf("cannot unmarshal columnHeaders len from uvarint")
+		return fmt.Errorf("cannot unmarshal columnHeaders len")
 	}
 	src = src[nSize:]
 	if n > maxColumnsPerBlock {
 		return fmt.Errorf("too many column headers: %d; mustn't exceed %d", n, maxColumnsPerBlock)
 	}
+
 	chs := csh.resizeColumnHeaders(int(n))
 	for i := range chs {
 		tail, err := chs[i].unmarshal(a, src)
@@ -317,12 +318,13 @@ func (csh *columnsHeader) unmarshal(a *arena, src []byte) error {
 	// unmarshal constColumns
 	n, nSize = encoding.UnmarshalVarUint64(src)
 	if nSize <= 0 {
-		return fmt.Errorf("cannot unmarshal constColumns len from uvarint")
+		return fmt.Errorf("cannot unmarshal constColumns len")
 	}
 	src = src[nSize:]
 	if n+uint64(len(csh.columnHeaders)) > maxColumnsPerBlock {
 		return fmt.Errorf("too many columns: %d; mustn't exceed %d", n+uint64(len(csh.columnHeaders)), maxColumnsPerBlock)
 	}
+
 	ccs := csh.resizeConstColumns(int(n))
 	for i := range ccs {
 		tail, err := ccs[i].unmarshal(a, src)
@@ -661,14 +663,14 @@ func (ch *columnHeader) unmarshalValues(src []byte) ([]byte, error) {
 
 	n, nSize := encoding.UnmarshalVarUint64(src)
 	if nSize <= 0 {
-		return srcOrig, fmt.Errorf("cannot unmarshal valuesOffset from uvarint")
+		return srcOrig, fmt.Errorf("cannot unmarshal valuesOffset")
 	}
 	src = src[nSize:]
 	ch.valuesOffset = n
 
 	n, nSize = encoding.UnmarshalVarUint64(src)
 	if nSize <= 0 {
-		return srcOrig, fmt.Errorf("cannot unmarshal valuesSize from uvarint")
+		return srcOrig, fmt.Errorf("cannot unmarshal valuesSize")
 	}
 	src = src[nSize:]
 	if n > maxValuesBlockSize {
@@ -684,14 +686,14 @@ func (ch *columnHeader) unmarshalBloomFilters(src []byte) ([]byte, error) {
 
 	n, nSize := encoding.UnmarshalVarUint64(src)
 	if nSize <= 0 {
-		return srcOrig, fmt.Errorf("cannot unmarshal bloomFilterOffset from uvarint")
+		return srcOrig, fmt.Errorf("cannot unmarshal bloomFilterOffset")
 	}
 	src = src[nSize:]
 	ch.bloomFilterOffset = n
 
 	n, nSize = encoding.UnmarshalVarUint64(src)
 	if nSize <= 0 {
-		return srcOrig, fmt.Errorf("cannot unmarshal bloomFilterSize from uvarint")
+		return srcOrig, fmt.Errorf("cannot unmarshal bloomFilterSize")
 	}
 	src = src[nSize:]
 	if n > maxBloomFilterBlockSize {
diff --git a/lib/logstorage/encoding.go b/lib/logstorage/encoding.go
index 95b34ae16..083519957 100644
--- a/lib/logstorage/encoding.go
+++ b/lib/logstorage/encoding.go
@@ -281,7 +281,7 @@ func unmarshalBytesBlock(dst, src []byte) ([]byte, []byte, error) {
 		// Read block length
 		blockLen, nSize := encoding.UnmarshalVarUint64(src)
 		if nSize <= 0 {
-			return dst, src, fmt.Errorf("cannot unmarshal compressed block size from uvarint")
+			return dst, src, fmt.Errorf("cannot unmarshal compressed block size")
 		}
 		src = src[nSize:]
 		if uint64(len(src)) < blockLen {
diff --git a/lib/logstorage/indexdb.go b/lib/logstorage/indexdb.go
index 441919f1c..dba66b3a1 100644
--- a/lib/logstorage/indexdb.go
+++ b/lib/logstorage/indexdb.go
@@ -509,7 +509,7 @@ func (idb *indexdb) loadStreamIDsFromCache(tenantIDs []TenantID, sf *StreamFilte
 	// Cache hit - unpack streamIDs from data.
 	n, nSize := encoding.UnmarshalVarUint64(data)
 	if nSize <= 0 {
-		logger.Panicf("BUG: cannot unmarshal the number of streamIDs from cache")
+		logger.Panicf("BUG: unexpected error when unmarshaling the number of streamIDs from cache")
 	}
 	src := data[nSize:]
 	streamIDs := make([]streamID, n)
diff --git a/lib/logstorage/stream_tags.go b/lib/logstorage/stream_tags.go
index 796bb315b..2e946bab6 100644
--- a/lib/logstorage/stream_tags.go
+++ b/lib/logstorage/stream_tags.go
@@ -121,7 +121,7 @@ func (st *StreamTags) UnmarshalCanonical(src []byte) ([]byte, error) {
 
 	n, nSize := encoding.UnmarshalVarUint64(src)
 	if nSize <= 0 {
-		return srcOrig, fmt.Errorf("cannot unmarshal tags len from uvarint")
+		return srcOrig, fmt.Errorf("cannot unmarshal tags len")
 	}
 	src = src[nSize:]
 	for i := uint64(0); i < n; i++ {