diff --git a/conanfile.py b/conanfile.py
index cd72b59..3e649fe 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -9,7 +9,7 @@
 
 class HomeObjectConan(ConanFile):
     name = "homeobject"
-    version = "2.1.18"
+    version = "2.1.19"
 
     homepage = "https://github.com/eBay/HomeObject"
     description = "Blob Store built on HomeReplication"
diff --git a/src/lib/homestore_backend/hs_cp_callbacks.cpp b/src/lib/homestore_backend/hs_cp_callbacks.cpp
index f50ce38..f54a0ed 100644
--- a/src/lib/homestore_backend/hs_cp_callbacks.cpp
+++ b/src/lib/homestore_backend/hs_cp_callbacks.cpp
@@ -23,7 +23,9 @@ using homestore::CPContext;
 
 namespace homeobject {
 
-std::unique_ptr< CPContext > HSHomeObject::MyCPCallbacks::on_switchover_cp(CP* cur_cp, CP* new_cp) { return nullptr; }
+std::unique_ptr< CPContext > HSHomeObject::MyCPCallbacks::on_switchover_cp(CP* cur_cp, CP* new_cp) {
+    return std::make_unique< CPContext >(new_cp);
+}
 
 // when cp_flush is called, it means that all the dirty candidates are already in the dirty list.
 // new dirty candidates will arrive on next cp's context.
diff --git a/src/lib/homestore_backend/hs_pg_manager.cpp b/src/lib/homestore_backend/hs_pg_manager.cpp
index 50beffd..da77684 100644
--- a/src/lib/homestore_backend/hs_pg_manager.cpp
+++ b/src/lib/homestore_backend/hs_pg_manager.cpp
@@ -47,10 +47,13 @@ PGError toPgError(ReplServiceError const& e) {
     case ReplServiceError::OK:
         DEBUG_ASSERT(false, "Should not process OK!");
         [[fallthrough]];
+    case ReplServiceError::DATA_DUPLICATED:
+        [[fallthrough]];
     case ReplServiceError::FAILED:
         return PGError::UNKNOWN;
+    default:
+        return PGError::UNKNOWN;
     }
-    return PGError::UNKNOWN;
 }
 
 [[maybe_unused]] static homestore::ReplDev& pg_repl_dev(PG const& pg) {