diff --git a/src/ProtocolManager.cpp b/src/ProtocolManager.cpp
index 693379a6a125009126ff228f358211a5f6d63802..ecab559d923b40c336c24502257837dc56d825dc 100644
--- a/src/ProtocolManager.cpp
+++ b/src/ProtocolManager.cpp
@@ -253,7 +253,7 @@ ResponseSP ProtocolManager::prepareMetadata(RequestSP request_sp)
                 boost::posix_time::ptime ptTimestamp =
                     boost::posix_time::ptime_from_tm(tmTimestamp);
 
-                DEBUG_STREAM << "ProtocolManager::prepareMetadata() Searching in "
+                INFO_STREAM << "ProtocolManager::prepareMetadata() Searching in "
                     << m_validatedSchema << "." << m_validatedTable << " timestamp "
                     << boost::posix_time::to_simple_string(ptTimestamp)
                     << " from " << m_remoteEndpoint << endl;
@@ -277,6 +277,8 @@ ResponseSP ProtocolManager::prepareMetadata(RequestSP request_sp)
                 {
                     metadataRes->set_state(Response::Metadata::ACCEPTED);
                     metadataRes->set_status("No more data");
+
+                    m_rowSet_sp.reset();
                 }
             }
             catch(std::exception& ex)