--- a/mtpfws/mtpfw/daemon/server/src/cmtpserversession.cpp	Fri Apr 16 15:51:48 2010 +0300
+++ b/mtpfws/mtpfw/daemon/server/src/cmtpserversession.cpp	Mon May 03 13:19:02 2010 +0300
@@ -132,12 +132,7 @@
     iSingletons.ConnectionMgr().SetClientSId(secureid);
     
     TInt length = aMessage.GetDesLength( 1 );
-    
-    if((!CheckIsBlueToothTransport(newUID) || (length!=0)) && (iSingletons.DpController().Count()==0))
-    	{
-    	iSingletons.DpController().LoadDataProvidersL();
-    	iSingletons.Router().ConfigureL();
-    	}
+
    
     if (length > 0)
     	{
@@ -165,6 +160,13 @@
     	aMessage.Complete(KErrNone);
     	}
     
+    // Fix TSW error MHAN-7ZU96Z
+    if((!CheckIsBlueToothTransport(newUID) || (length!=0)) && (iSingletons.DpController().Count()==0))
+    	{
+    	iSingletons.DpController().LoadDataProvidersL();
+    	iSingletons.Router().ConfigureL();
+    	}
+    
     
     __FLOG(_L8("DoStartTransportL - Exit"));
     }