FIXED :: handlig invalid endpoints names