--- a/internetradio2.0/datastructuressrc/irchannelserverurl.cpp	Thu May 27 12:46:34 2010 +0300
+++ b/internetradio2.0/datastructuressrc/irchannelserverurl.cpp	Fri Jun 11 13:30:40 2010 +0300
@@ -212,28 +212,24 @@
 	{
 	IRLOG_DEBUG( "CIRChannelServerUrl::ExternalizeL - Entering" );
 	TInt len;
-	if( !iServerName )
+	if(iServerName && (len=iServerName->Length()) > 0)
 		{
-		len=0;
-		aWriteStream.WriteInt32L(len);
-		}
-	else
-		{
-		len=iServerName->Length();
 		aWriteStream.WriteInt32L(len);
 		aWriteStream << *iServerName;
 		}
-		
-	if(!iURL )
+	else
 		{
-		len=0;
+		aWriteStream.WriteInt32L(0);
+		}
+		
+	if(iURL && (len=iURL->Length()) > 0)
+		{
 		aWriteStream.WriteInt32L(len);
+		aWriteStream << *iURL;
 		}
 	else
 		{
-		len=iURL->Length();
-		aWriteStream.WriteInt32L(len);
-		aWriteStream << *iURL;
+		aWriteStream.WriteInt32L(0);
 		}
 		
 	aWriteStream.WriteInt32L(iBitrate);