diff --git a/Fwk/AppFwk/CommonCode/cvfStructGrid.cpp b/Fwk/AppFwk/CommonCode/cvfStructGrid.cpp
index ff9923fa26..661b9c9ce6 100644
--- a/Fwk/AppFwk/CommonCode/cvfStructGrid.cpp
+++ b/Fwk/AppFwk/CommonCode/cvfStructGrid.cpp
@@ -367,6 +367,8 @@ bool StructGridInterface::hasValidCharacteristicCellSizes() const
 //--------------------------------------------------------------------------------------------------
 void StructGridInterface::computeCharacteristicCellSize( const std::vector<size_t>& globalCellIndices ) const
 {
+    if ( globalCellIndices.empty() ) return;
+
     ubyte faceConnPosI[4];
     cellFaceVertexIndices( StructGridInterface::POS_I, faceConnPosI );
 
diff --git a/Fwk/VizFwk/LibGeometry/cvfBoundingBoxTree.cpp b/Fwk/VizFwk/LibGeometry/cvfBoundingBoxTree.cpp
index 54666fd83a..d38c9c83d8 100644
--- a/Fwk/VizFwk/LibGeometry/cvfBoundingBoxTree.cpp
+++ b/Fwk/VizFwk/LibGeometry/cvfBoundingBoxTree.cpp
@@ -716,6 +716,7 @@ std::string AABBTree::treeInfo() const
 {
     size_t treeSizeInMB = treeSize() / (1024u *1024u);
     auto text = "Tree size : " + std::to_string(treeSizeInMB) + "[MB] \n";
+    if (treeSize() == 0) return text;
     
     text += "Num leaves: " + std::to_string(leavesCount()) + "\n";