diff --git a/conanfile.py b/conanfile.py
index a79ac2193..5684885fa 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -9,7 +9,7 @@
 
 class HomestoreConan(ConanFile):
     name = "homestore"
-    version = "7.1.3"
+    version = "7.1.4"
 
     homepage = "https://github.com/eBay/Homestore"
     description = "HomeStore Storage Engine"
diff --git a/src/lib/index/index_service.cpp b/src/lib/index/index_service.cpp
index 620532ba0..a4c4cd71c 100644
--- a/src/lib/index/index_service.cpp
+++ b/src/lib/index/index_service.cpp
@@ -248,7 +248,10 @@ IndexBuffer::IndexBuffer(BlkId blkid, uint32_t buf_size, uint32_t align_size) :
 IndexBuffer::IndexBuffer(uint8_t* raw_bytes, BlkId blkid) : m_blkid(blkid), m_bytes{raw_bytes} {}
 
 IndexBuffer::~IndexBuffer() {
-    if (m_bytes) { hs_utils::iobuf_free(m_bytes, sisl::buftag::btree_node); }
+    if (m_bytes) {
+        hs_utils::iobuf_free(m_bytes, sisl::buftag::btree_node);
+        m_bytes = nullptr;
+    }
 }
 
 std::string IndexBuffer::to_string() const {
diff --git a/src/lib/replication/repl_dev/common.cpp b/src/lib/replication/repl_dev/common.cpp
index 81362de62..e5484125c 100644
--- a/src/lib/replication/repl_dev/common.cpp
+++ b/src/lib/replication/repl_dev/common.cpp
@@ -59,7 +59,10 @@ ReplServiceError repl_req_ctx::init(repl_key rkey, journal_type_t op_code, bool
 }
 
 repl_req_ctx::~repl_req_ctx() {
-    if (m_journal_entry) { m_journal_entry->~repl_journal_entry(); }
+    if (m_journal_entry) {
+        m_journal_entry->~repl_journal_entry();
+        m_journal_entry = nullptr;
+    }
 }
 
 void repl_req_ctx::create_journal_entry(bool is_raft_buf, int32_t server_id) {