diff --git a/include/Topology/generic/attributeHandler.h b/include/Topology/generic/attributeHandler.h
index 4c0d88286f5a225d9a398979056d3f861c30a20e..8a810ee783305ac7e94e153b923b6b7dc2a52e00 100644
--- a/include/Topology/generic/attributeHandler.h
+++ b/include/Topology/generic/attributeHandler.h
@@ -35,7 +35,7 @@ namespace CGoGN
 
 /**
  * Class that create an access-table to an existing attribute
- * Permetting operation are:
+ * Main available operations are:
  * - [ index ]
  * - [ dart ]
  * - begin / end / next to manage indexing
@@ -109,7 +109,7 @@ public:
 	 * check if the attribute handler is linked to a valid attribute
 	 * -> MUST BE USED AFTER A CALL TO :
 	 * getAttribute(unsigned int orbit, const std::string& nameAttr)
-	 * addAttribute( unsigned int orbit, const std::string& nameAttr)
+	 * addAttribute(unsigned int orbit, const std::string& nameAttr)
 	 */
 	bool isValid() const ;
 
diff --git a/include/Topology/generic/genericmap.hpp b/include/Topology/generic/genericmap.hpp
index 39b73502dfe407222f80a0b423c02c0400768229..b62d1145b6910a790905429790956595ad4e69f3 100644
--- a/include/Topology/generic/genericmap.hpp
+++ b/include/Topology/generic/genericmap.hpp
@@ -223,6 +223,7 @@ inline void GenericMap::initCell(unsigned int orbit, unsigned int i)
 template <typename T>
 inline AttribMultiVect<T>& GenericMap::getAttributeVector(unsigned int idAttr)
 {
+	assert(idAttr != AttribContainer::UNKNOWN) ;
 	return m_attribs[AttribContainer::orbitAttr(idAttr)].getDataVector<T>(AttribContainer::indexAttr(idAttr)) ;
 }
 
@@ -234,12 +235,13 @@ inline AttribMultiVect<Mark>* GenericMap::getMarkerVector(unsigned int orbit)
 
 inline AttribMultiVectGen& GenericMap::getMultiVec(unsigned int idAttr)
 {
+	assert(idAttr != AttribContainer::UNKNOWN) ;
 	return m_attribs[AttribContainer::orbitAttr(idAttr)].getVirtualDataVector(AttribContainer::indexAttr(idAttr)) ;
 }
 
 inline AttribContainer& GenericMap::getAttributeContainer(unsigned int orbit)
 {
-	assert(isOrbitEmbedded(orbit) || !"Invalid parameter: orbit not embedded");
+//	assert(isOrbitEmbedded(orbit) || !"Invalid parameter: orbit not embedded");
 	return m_attribs[orbit] ;
 }