diff --git a/RouterContext.cpp b/RouterContext.cpp
index 4cc45b80..c6cac3ee 100644
--- a/RouterContext.cpp
+++ b/RouterContext.cpp
@@ -157,21 +157,22 @@ namespace i2p
 	void RouterContext::SetFamily (const std::string& family)
 	{
 
+		m_FamilyString = family;
+		if (m_FamilyString.length() == 0)
+			m_FamilyString = "<undefined>
+
 		std::string signature;
 		if (family.length () > 0)
 		{
-			m_FamilyString = family;
 			signature = i2p::data::CreateFamilySignature (family, GetIdentHash ());
 		}
 		if (signature.length () > 0)
 		{
-			m_FamilyString = "<none>";
 			m_RouterInfo.SetProperty (i2p::data::ROUTER_INFO_PROPERTY_FAMILY, family);
 			m_RouterInfo.SetProperty (i2p::data::ROUTER_INFO_PROPERTY_FAMILY_SIG, signature);
 		}	
 		else
 		{
-			m_FamilyString = "<???>";
 			m_RouterInfo.DeleteProperty (i2p::data::ROUTER_INFO_PROPERTY_FAMILY);
 			m_RouterInfo.DeleteProperty (i2p::data::ROUTER_INFO_PROPERTY_FAMILY_SIG);
 		}