diff --git a/similarity_search/include/logging.h b/similarity_search/include/logging.h
index 7505888..b03f754 100644
--- a/similarity_search/include/logging.h
+++ b/similarity_search/include/logging.h
@@ -128,7 +128,7 @@ class RuntimeErrorWrapper {
 
 #define CHECK_MSG(condition,message) \
   if (!(condition)) {\
-    LOG(LIB_ERROR) << "Check failed: " << #condition;  \
+    LOG(LIB_ERROR) << "Check failed: " << #condition << " " << string(message);  \
     throw runtime_error("Check failed: " + string(message)); \
   }
 
diff --git a/similarity_search/src/method/hnsw.cc b/similarity_search/src/method/hnsw.cc
index 8e0775b..f88e7f9 100644
--- a/similarity_search/src/method/hnsw.cc
+++ b/similarity_search/src/method/hnsw.cc
@@ -684,7 +684,7 @@ namespace similarity {
     void
     Hnsw<dist_t>::Search(KNNQuery<dist_t> *query, IdType) const
     {
-        if (this->data_.empty()) {
+        if (this->data_.empty() and this->data_rearranged_.empty()) {
           return;
         }
         bool useOld = searchAlgoType_ == kOld || (searchAlgoType_ == kHybrid && ef_ >= 1000);