diff --git a/generator/feature_builder.cpp b/generator/feature_builder.cpp
index 4d4ba40d01..e14fa6fff8 100644
--- a/generator/feature_builder.cpp
+++ b/generator/feature_builder.cpp
@@ -88,8 +88,6 @@ bool FeatureBuilder::IsGeometryClosed() const
 
 m2::PointD FeatureBuilder::GetGeometryCenter() const
 {
-  //TODO(vng): Check requirements in this assert
-  //ASSERT ( IsGeometryClosed(), () );
   m2::PointD ret(0.0, 0.0);
 
   PointSeq const & poly = GetOuterGeometry();
diff --git a/generator/feature_maker_base.cpp b/generator/feature_maker_base.cpp
index b7103eee90..e3c436f8df 100644
--- a/generator/feature_maker_base.cpp
+++ b/generator/feature_maker_base.cpp
@@ -73,10 +73,11 @@ void TransformToPoint(FeatureBuilder & feature)
 
 void TransformToLine(FeatureBuilder & feature)
 {
-  if (feature.IsArea() || feature.IsLine())
-    feature.SetLinear(feature.GetParams().m_reverseGeometry);
-  else
-    CHECK(false, (feature));
+  if (feature.IsLine())
+    return;
+
+  CHECK(feature.IsArea(), (feature));
+  feature.SetLinear(feature.GetParams().m_reverseGeometry);
 }
 
 FeatureBuilder MakePoint(FeatureBuilder const & feature)
diff --git a/indexer/feature_data.cpp b/indexer/feature_data.cpp
index 2d9395778d..1095d9468d 100644
--- a/indexer/feature_data.cpp
+++ b/indexer/feature_data.cpp
@@ -222,10 +222,7 @@ bool FeatureParamsBase::operator == (FeatureParamsBase const & rhs) const
 
 bool FeatureParamsBase::IsValid() const
 {
-   if (layer <= LAYER_LOW || layer >= LAYER_HIGH)
-     return false;
-
-   return true;
+  return layer > LAYER_LOW && layer < LAYER_HIGH;
 }
 
 string FeatureParamsBase::DebugString() const
@@ -399,6 +396,7 @@ void FeatureParams::SetGeomTypePointEx()
 
 feature::GeomType FeatureParams::GetGeomType() const
 {
+  CHECK(IsValid(), ());
   switch (m_geomType)
   {
   case HeaderGeomType::Line: return GeomType::Line;
@@ -409,6 +407,7 @@ feature::GeomType FeatureParams::GetGeomType() const
 
 HeaderGeomType FeatureParams::GetHeaderGeomType() const
 {
+  CHECK(IsValid(), ());
   return m_geomType;
 }