--- a/mmappcomponents/mmmtpdataprovider/mmmtpdpplugins/mediamtpdataprovider/src/cmediamtpdataprovidermoveobject.cpp	Fri Feb 19 23:18:32 2010 +0200
+++ b/mmappcomponents/mmmtpdataprovider/mmmtpdpplugins/mediamtpdataprovider/src/cmediamtpdataprovidermoveobject.cpp	Fri Mar 12 15:44:36 2010 +0200
@@ -125,14 +125,10 @@
                 iPropertyElement = &( iPropertyList->ReservePropElemL( aHandle, aPropCode ) );
                 iPropertyElement->SetStringL( CMTPTypeObjectPropListElement::EValue, textData->StringChars() );
                 }
-            else if ( err == KErrNotFound )
+            else
                 {
                 iPropertyElement = NULL;
                 }
-            else
-                {
-                User::Leave( err );
-                }
 
             CleanupStack::PopAndDestroy( textData ); // - textData
             }
@@ -150,18 +146,13 @@
 
             if ( err == KErrNone )
                 {
-
                 iPropertyElement = &( iPropertyList->ReservePropElemL( aHandle, aPropCode ) );
                 iPropertyElement->SetArrayL( CMTPTypeObjectPropListElement::EValue, *desData );
                 }
-            else if ( err == KErrNotFound )
+            else
                 {
                 iPropertyElement = NULL;
                 }
-            else
-                {
-                User::Leave( err );
-                }
 
             CleanupStack::PopAndDestroy( desData ); // - desData
             }
@@ -183,14 +174,10 @@
                 iPropertyElement = &( iPropertyList->ReservePropElemL( aHandle, aPropCode ) );
                 iPropertyElement->SetUint16L( CMTPTypeObjectPropListElement::EValue, uint16.Value() );
                 }
-            else if ( err == KErrNotFound )
+            else
                 {
                 iPropertyElement = NULL;
                 }
-            else
-                {
-                User::Leave( err );
-                }
             }
             break;
 
@@ -217,14 +204,10 @@
                 iPropertyElement = &( iPropertyList->ReservePropElemL( aHandle, aPropCode ) );
                 iPropertyElement->SetUint32L( CMTPTypeObjectPropListElement::EValue, uint32.Value() );
                 }
-            else if ( err == KErrNotFound )
+            else
                 {
                 iPropertyElement = NULL;
                 }
-            else
-                {
-                User::Leave( err );
-                }
             }
             break;