diff -r 9dbc70490d9a -r 988c3ea2e6de brandingserver/BSServer/cbsstoragemanager.cpp
--- a/brandingserver/BSServer/cbsstoragemanager.cpp	Sun Apr 11 15:33:49 2010 +0530
+++ b/brandingserver/BSServer/cbsstoragemanager.cpp	Fri Apr 16 23:09:29 2010 +0530
@@ -267,6 +267,7 @@
                   langBuf.Length() + KDot().Length() * 3 + KMaxVersionLenght;
 	fileName = HBufC::NewLC( length );
     
+    if(fileName){
     TPtr file( fileName->Des() );
 
     // [application_id]\[brand_id]\[def_filename][language_id]
@@ -286,11 +287,9 @@
 	    file.Append( KDot() );
     	file.Append( versionBuffer );
     	}
-
-    if( fileName )
-    	{
-    	CleanupStack::Pop( fileName );
-    	}
+    	
+    	CleanupStack::Pop( fileName );      
+    }
     return fileName;
     }