diff --git a/GFRave/src/GFRaveVertexFactory.cc b/GFRave/src/GFRaveVertexFactory.cc
index 60321295..a60428e7 100644
--- a/GFRave/src/GFRaveVertexFactory.cc
+++ b/GFRave/src/GFRaveVertexFactory.cc
@@ -77,9 +77,11 @@ GFRaveVertexFactory::findVertices ( std::vector <  genfit::GFRaveVertex* > * GFv
                      IdGFTrackStateMap_);
   }
   catch(Exception & e){
+    clearMap();
     std::cerr << e.what();
   }
 
+  clearMap();
 }
 
 
@@ -98,9 +100,11 @@ GFRaveVertexFactory::findVertices ( std::vector <  genfit::GFRaveVertex* > * GFv
                      IdGFTrackStateMap_);
   }
   catch(Exception & e){
+    clearMap();
     std::cerr << e.what();
   }
 
+  clearMap();
 }