--- a/presencecache/presencecachesymbian/presencecacheserver2/src/presencecacheservicestore.cpp	Thu Sep 09 16:37:32 2010 +0300
+++ b/presencecache/presencecachesymbian/presencecacheserver2/src/presencecacheservicestore.cpp	Tue Sep 21 17:07:25 2010 +0300
@@ -30,9 +30,8 @@
 //
 EXPORT_C CPresenceCacheServiceStore* CPresenceCacheServiceStore::NewLC()
     {
-    CPresenceCacheServiceStore* self = new( ELeave ) CPresenceCacheServiceStore;
+    CPresenceCacheServiceStore* self = CPresenceCacheServiceStore::NewL();
     CleanupStack::PushL( self );
-    self->ConstructL();
     return self;
     }
 
@@ -42,7 +41,9 @@
 //
 EXPORT_C CPresenceCacheServiceStore* CPresenceCacheServiceStore::NewL()
     {
-    CPresenceCacheServiceStore* self = NewLC();
+    CPresenceCacheServiceStore* self = new( ELeave ) CPresenceCacheServiceStore;
+    CleanupStack::PushL( self );
+    self->ConstructL();
     CleanupStack::Pop( self );
     return self;
     }
@@ -230,6 +231,7 @@
     aErr = KErrNotFound;
 
     TInt count = iBuddyStoreCollection.Count();
+    TRACE_1( _L("CPresenceCacheServiceStore::FindAndRemove - count = %d"),count );
     for (TInt i=0;i<count;i++)
         {
         if ( (iBuddyStoreCollection[i])->EqualsIdentity(aIdentity) )