--- a/omadmadapters/connmoadapter/src/ProxyBranch.cpp	Fri Sep 17 19:58:05 2010 +0530
+++ b/omadmadapters/connmoadapter/src/ProxyBranch.cpp	Fri Oct 15 11:39:02 2010 +0530
@@ -147,12 +147,13 @@
                 conRef.Append( _L("NAP/") );
                 CUtils::AppendFirstURISeg( napChildList, conRef );
                 HBufC8* napLuid = iCallback->GetLuidAllocL( conRef );
+                CleanupStack::PushL(napLuid) ;
                 if ( cmId == CUtils::IntLUID( *napLuid ) )
                     {
                     status = CSmlDmAdapter::EOk;
                     aLeafObject.InsertL( 0, conRef );
                     }
-                delete napLuid;
+                CleanupStack::PopAndDestroy( napLuid );
                 conRef.Delete( 0, conRef.Length() );
                 }
             }