diff -r 093cf0757204 -r 938269283a16 eapol/eapol_framework/eapol_common/am/common/eap_am_network_id.cpp
--- a/eapol/eapol_framework/eapol_common/am/common/eap_am_network_id.cpp	Fri May 14 15:54:13 2010 +0300
+++ b/eapol/eapol_framework/eapol_common/am/common/eap_am_network_id.cpp	Fri Jun 11 13:40:22 2010 +0300
@@ -16,7 +16,7 @@
 */
 
 /*
-* %version: 14 %
+* %version: %
 */
 
 // This is enumeration of EAPOL source code.
@@ -364,7 +364,8 @@
 // 
 EAP_FUNC_EXPORT const u8_t * eap_am_network_id_c::get_source() const
 {
-	if (m_data == 0)
+	if (m_data == 0
+		|| m_data->m_source.get_is_valid_data() == false)
 	{
 		return 0;
 	}
@@ -388,7 +389,8 @@
 // 
 EAP_FUNC_EXPORT const u8_t * eap_am_network_id_c::get_destination() const
 {
-	if (m_data == 0)
+	if (m_data == 0
+		|| m_data->m_destination.get_is_valid_data() == false)
 	{
 		return 0;
 	}
@@ -400,7 +402,8 @@
 // 
 EAP_FUNC_EXPORT u32_t eap_am_network_id_c::get_source_length() const
 {
-	if (m_data == 0)
+	if (m_data == 0
+		|| m_data->m_source.get_is_valid_data() == false)
 	{
 		return 0;
 	}
@@ -412,7 +415,8 @@
 // 
 EAP_FUNC_EXPORT u32_t eap_am_network_id_c::get_destination_length() const
 {
-	if (m_data == 0)
+	if (m_data == 0
+		|| m_data->m_destination.get_is_valid_data() == false)
 	{
 		return 0;
 	}