--- a/mmsharing/mmshavailability/src/musavaterminal.cpp	Tue Aug 31 15:12:07 2010 +0300
+++ b/mmsharing/mmshavailability/src/musavaterminal.cpp	Wed Sep 01 12:31:01 2010 +0100
@@ -189,7 +189,15 @@
 
     ResetAndDestroyQuery();
                   
-    aQuery->ExecuteL();
+    if( aQuery->ValidateUri() )
+    	{
+		aQuery->ExecuteL();
+    	}
+    
+    else
+    	{
+		User::Leave( KErrNotSupported );
+    	}
     
     iQuery = aQuery;                           
         
@@ -513,12 +521,7 @@
             CleanupStack::PushL( videoCodecs );
             capability->Exchange().QueryObserver().VideoCodecsResolvedL( *videoCodecs );
             CleanupStack::PopAndDestroy( videoCodecs );                    
-            
-            //store fast startup mode if present
-            MusSettingsKeys::TFastMode mode = 
-                CMusAvaCapability::ResolveFastModeL( *sdp );
-            capability->Exchange().QueryObserver().FastModeResolved( mode );
-            
+        
             CleanupStack::PopAndDestroy( sdp );
             
             capability->PopulateResponseL( aQuery,