--- a/btobexprofiles/obexsendservices/obexservicesendutils/src/BTServiceStarter.cpp	Tue Jul 06 14:27:09 2010 +0300
+++ b/btobexprofiles/obexsendservices/obexservicesendutils/src/BTServiceStarter.cpp	Wed Aug 18 09:59:05 2010 +0300
@@ -743,7 +743,7 @@
     {
     FLOG(_L("[BTSU]\t CBTServiceStarter::ServiceAttributeSearchComplete()"));               
     TInt err = KErrNone;
-    if (aErr==KErrEof && aAttr.Count()>0 )
+    if ((aErr==KErrEof || aErr==KErrNone) && aAttr.Count()>0 )
         {            
         RSdpResultArray results=aAttr;    
         iBTEngDiscovery->ParseRfcommChannel(results,iClientChannel);          
@@ -812,6 +812,10 @@
         iState = EBTSStarterFindingBIP;  
         iTriedOPP = ETrue;
         }
+    else if (aErr==KErrNone && aAttr.Count()==0)
+        {
+        // This isn't KErrEof so we aren't done yet, wait for further matches
+        }
     else
         {
         // Set destroyer AO active (destroys CBTEngDiscovery/CBTEngSdpQuery classes). This is done