diff --git a/mesh_map/src/mesh_map.cpp b/mesh_map/src/mesh_map.cpp
index 2c88f962..edcbe1cb 100644
--- a/mesh_map/src/mesh_map.cpp
+++ b/mesh_map/src/mesh_map.cpp
@@ -284,10 +284,9 @@ bool MeshMap::readMap()
   hdf5_mesh_input->setMeshName(mesh_working_part);
   lvr2::MeshBufferPtr mesh_buffer = hdf5_mesh_input->MeshIO::load(mesh_working_part);
 
-  RCLCPP_DEBUG_STREAM(node->get_logger(), "Convert buffer to HEM: \n" << *mesh_buffer);
-
   if(mesh_buffer)
   {
+    RCLCPP_DEBUG_STREAM(node->get_logger(), "Convert buffer to HEM: \n" << *mesh_buffer);
     RCLCPP_DEBUG_STREAM(node->get_logger(), "Creating mesh of type '" << hem_impl_ << "'");
     mesh_ptr = createHemByName(hem_impl_, mesh_buffer);
     RCLCPP_INFO_STREAM(node->get_logger(), "The mesh of type '" << hem_impl_ <<  "' has been loaded successfully with " 
diff --git a/mesh_navigation/package.xml b/mesh_navigation/package.xml
index ff2a7c22..a73a1c0b 100644
--- a/mesh_navigation/package.xml
+++ b/mesh_navigation/package.xml
@@ -10,7 +10,6 @@
 
     <exec_depend>mbf_mesh_core</exec_depend>
     <exec_depend>mbf_mesh_nav</exec_depend>
-    <exec_depend>mesh_client</exec_depend>
     <exec_depend>mesh_controller</exec_depend>
     <exec_depend>mesh_layers</exec_depend>
     <exec_depend>mesh_map</exec_depend>