--- a/mmappcomponents/mmmtpdataprovider/src/cmmmtpdpmetadatavideoaccess.cpp	Thu Jul 15 19:11:42 2010 +0300
+++ b/mmappcomponents/mmmtpdataprovider/src/cmmmtpdpmetadatavideoaccess.cpp	Thu Aug 19 10:24:28 2010 +0300
@@ -89,6 +89,8 @@
     User::LeaveIfError( iDbsSession.Connect() );
 
     TInt err = DriveInfo::GetDefaultDrive( DriveInfo::EDefaultPhoneMemory, iStoreNum );
+    PRINT1( _L( "MM MTP <> CMmMtpDpMetadataVideoAccess::ConstructL, EDefaultPhoneMemory err = %d" ), err );
+    User::LeaveIfError( err );
 
     err = OpenDatabase();
 
@@ -153,15 +155,17 @@
             }
         }
 
-    TBuf<KStorageRootMaxLength> storeRoot;
-    err = PathInfo::GetRootPath( storeRoot, iStoreNum );
-    iRfs.SetSessionPath( storeRoot );
-
     if ( err == KErrNone )
         {
         iDbOpened = ETrue;
         }
 
+    TBuf<KStorageRootMaxLength> storeRoot;
+    if( PathInfo::GetRootPath( storeRoot, iStoreNum ) == KErrNone )
+        {
+        iRfs.SetSessionPath( storeRoot );
+        }
+
     PRINT( _L( "MM MTP <= CMmMtpDpMetadataVideoAccess::OpenDatabase" ) );
     return err;
     }
@@ -349,12 +353,14 @@
 
     for ( iRecordSet.FirstL(); iRecordSet.AtRow(); iRecordSet.NextL() )
         {
+#ifdef _DEBUG
         HBufC* data = ReadLongTextL( KMtpVideoLocation );
-        CleanupStack::PushL( data );
 
         PRINT1( _L( "MM MTP <> CleanupDbIfNecessaryL removing %S from database" ), data );
+        delete data;
+        data = NULL;
+#endif
         iRecordSet.DeleteL();
-        CleanupStack::PopAndDestroy( data );
         }
 
     delete iColSet;
@@ -706,9 +712,8 @@
         OpenDatabaseL();
 
     // File Path
-    HBufC* suid = aObjectMetaData.DesC( CMTPObjectMetaData::ESuid ).AllocLC();  // + suid
-    SetRecordL( *suid, ERecordRead );
-    CleanupStack::PopAndDestroy( suid ); // - suid
+    const TDesC& suid = aObjectMetaData.DesC( CMTPObjectMetaData::ESuid );
+    SetRecordL( suid, ERecordRead );
 
     HBufC* data = NULL;
     TDbColNo num;
@@ -779,16 +784,14 @@
             {
             PRINT( _L( "MM MTP <> EMTPObjectPropCodeDescription-MD" ) );
             data = ReadLongTextL( KMtpVideoComment );
+            CleanupStack::PushL( data ); // + data
 
             TInt len = data->Length();
             PRINT1( _L( "MM MTP <> CMmMtpDpMetadataMpxAccess::GetObjectMetadataValue len = %d" ),len );
-            if ( len != 0 )
-                {
-                for ( TInt i = 0; i < len; i++ )
-                    ( ( CMTPTypeArray& ) aNewData ).AppendUintL( ( *data )[i] );
-                }
+            for ( TInt i = 0; i < len; i++ )
+                ( ( CMTPTypeArray& ) aNewData ).AppendUintL( ( *data )[i] );
 
-            delete data;
+            CleanupStack::PopAndDestroy( data ); // - data
             data = NULL;
             }
             break;
@@ -1025,6 +1028,7 @@
     // Pack the info to aNewData
     if ( data )
         {
+        CleanupStack::PushL( data ); // + data
 #ifdef _DEBUG
         if ( data->Length() > KMtpMaxStringDescLength )   // Have to concatenate for MTP
             {
@@ -1040,8 +1044,7 @@
             {
             User::Leave( KErrArgument );
             }
-        delete data;
-        data = NULL;
+        CleanupStack::PopAndDestroy( data ); // - data
         }
 
     PRINT( _L( "MM MTP <= CMmMtpDpMetadataVideoAccess::GetObjectMetadataValue" ) );