--- a/webservices/wsconnection/src/senserviceconnectionimpl.cpp	Tue Aug 31 16:18:26 2010 +0300
+++ b/webservices/wsconnection/src/senserviceconnectionimpl.cpp	Wed Sep 01 12:28:05 2010 +0100
@@ -45,9 +45,9 @@
 
 #include "senservicemanagerdefines.h"
 #include "SenBaseAttribute.h"
-#include <xml/dom/xmlengchunkcontainer.h>
-#include <xml/dom/xmlengfilecontainer.h>
-#include <xml/dom/xmlengserializer.h>
+#include <xmlengchunkcontainer.h>
+#include <xmlengfilecontainer.h>
+#include <xmlengserializer.h>
 #include "senconnagentserver.h"
 #include "senxmldebug.h"
 #include "senatomentry.h"
@@ -621,7 +621,6 @@
             TLSLOG_L(KSenServiceConnectionLogChannelBase+iConnectionID, KMinLogLevel ,"SubmitL - ESenInternalError");
             retVal = KErrSenInternal;
             }
-            break;
         default:
             {
             TLSLOG_L(KSenServiceConnectionLogChannelBase+iConnectionID, KMinLogLevel ,"SubmitL - default");
@@ -2512,19 +2511,16 @@
     		}
     	else
         	{
-	    	TMessage message = ipSenServiceDispatcher->GetMessageFromQueue(aTransactionID);
-	    	CSenAsyncOperation* pAsyncOp = message.iSenAsyncOperation;
-	    	if (pAsyncOp)
-	    	    {
-	            TInt idx(-1);
-	            TRAP( retVal,
-					idx = AsyncOpsArrayL().Find(pAsyncOp);
-		            if (idx >= 0)
-		                {
-		                AsyncOpsArrayL().Remove(idx);
-		                }
-				  );
-	    	    pAsyncOp->iActive = NULL;
+    	TMessage message = ipSenServiceDispatcher->GetMessageFromQueue(aTransactionID);
+    	CSenAsyncOperation* pAsyncOp = message.iSenAsyncOperation;
+    	if (pAsyncOp)
+    	    {
+            TInt idx = AsyncOpsArrayL().Find(pAsyncOp);    
+            if (idx >= 0)
+                {
+                AsyncOpsArrayL().Remove(idx);
+                }
+    	    pAsyncOp->iActive = NULL;
     	    
     	    pAsyncOp->Cancel();
             delete pAsyncOp;