diff --git a/storage/include/storage/bpt.hpp b/storage/include/storage/bpt.hpp
index 52bff67..179c7a0 100644
--- a/storage/include/storage/bpt.hpp
+++ b/storage/include/storage/bpt.hpp
@@ -823,7 +823,7 @@ class BPlusTreeIndexer {
     if (pos.is_end) return false;
     if (key_cmp(key, pos.path.back().first.template As<PageType>()->data.p_data[pos.path.back().second].first))
       return false;
-    if (!value_removed) {
+    if (value_removed != nullptr) {
       *value_removed = pos.path.back().first.template As<PageType>()->data.p_data[pos.path.back().second].second;
     }
     RemoveEntryAt(pos);
diff --git a/test/buffer_pool_manager_test.cpp b/test/buffer_pool_manager_test.cpp
index 9f87527..46b9841 100644
--- a/test/buffer_pool_manager_test.cpp
+++ b/test/buffer_pool_manager_test.cpp
@@ -263,8 +263,8 @@ TEST(MemoryRiver, T2) {
   size_t interal_id_tot = 0;
   const unsigned int RndSeed = testing::GTEST_FLAG(random_seed);
   std::mt19937 rnd(RndSeed);
-  remove("T2.std");
-  remove("T2.dat");
+  remove("/tmp/T2.std");
+  remove("/tmp/T2.dat");
   const int kInfoLength = 100;
   {
     sol::MemoryRiver<DataType, kInfoLength> STD("/tmp/T2.std");