--- a/simpledatamodeladapter/src/presenceplugingroup.cpp	Fri Mar 12 15:44:19 2010 +0200
+++ b/simpledatamodeladapter/src/presenceplugingroup.cpp	Mon Mar 15 12:42:13 2010 +0200
@@ -25,7 +25,7 @@
 #include <ximpstatus.h>
 #include <ximpidentity.h>
 #include <ximpobjectcollection.h>
-#include <xdmerrors.h>
+#include <XdmErrors.h>
 #include <presentitygroupinfo.h>
 #include <presentitygroupmemberinfo.h>
 #include <utf.h>
@@ -337,6 +337,15 @@
         // OK response
         CallActualXdmOperationL( myStatus );
         }
+    else if ( KErrNotFound == myStatus && !iCompleted )
+        {
+        DP_SDA("CPresencePluginGroups::RunL KErrNotFound == myStatus");
+        
+        // DoPerformUnsubscribePresentityPresenceL didn't find watcher
+        // so it did not execute StopSubscribeL from the watcher. Still
+        // presentity group member has to be removed.
+        CallActualXdmOperationL( KErrNone );
+        }
     else if ( !myStatus && iCompleted )
         {
         DP_SDA("CPresencePluginGroups::RunL SEND COMPLETE");