--- a/omadmadapters/connmoadapter/src/AddBuffer.cpp	Fri Sep 17 08:27:39 2010 +0300
+++ b/omadmadapters/connmoadapter/src/AddBuffer.cpp	Mon Oct 04 00:06:35 2010 +0300
@@ -279,8 +279,22 @@
                 first = EFalse;
                 retval = 0;
                 }
-            aGroup->Append(iBuffer[i]);
-            iCache.Append(iBuffer[i]);
+            TInt err = KErrNone;
+            TRAP(err,aGroup->AppendL(iBuffer[i]));
+            if(err != KErrNone)
+                {
+				retval = err;
+                break;
+                }
+            TRAP(err,iCache.AppendL(iBuffer[i]));
+            if(err != KErrNone)
+                {
+                TInt indx = aGroup->Find(iBuffer[i]);
+                if(indx != KErrNotFound)
+                    aGroup->Remove(indx);
+				retval = err;
+                break;
+                }
             retval++;
             }
         }