--- a/mtpdataproviders/mtpimagedp/src/cmtpimagedp.cpp	Thu Aug 19 10:44:03 2010 +0300
+++ b/mtpdataproviders/mtpimagedp/src/cmtpimagedp.cpp	Tue Aug 31 16:03:15 2010 +0300
@@ -96,8 +96,6 @@
     {
     __FLOG_OPEN(KMTPSubsystem, KComponent);
     __FLOG(_L8(">> CMTPImageDataProvider::ConstructL"));
-    
-    iThumbnailManager = CMTPImageDpThumbnailCreator::NewL(*this);
     iNewPicNotifier = CMTPImageDpNewPicturesNotifier::NewL();
     
     //Setup central repository connection
@@ -454,11 +452,14 @@
     __FLOG(_L8("<< NotifyStorageEnumerationCompleteL"));        
     }
 
-CMTPImageDpThumbnailCreator& CMTPImageDataProvider::ThumbnailManager() const
-	{
-    __ASSERT_DEBUG(iThumbnailManager, User::Invariant());
-	return *iThumbnailManager;
-	}
+CMTPImageDpThumbnailCreator* CMTPImageDataProvider::ThumbnailManager()
+    {
+    if(NULL == iThumbnailManager)
+        {
+        TRAP_IGNORE(iThumbnailManager = CMTPImageDpThumbnailCreator::NewL(*this));
+        }
+    return iThumbnailManager;
+    }
 
 CMTPImageDpObjectPropertyMgr& CMTPImageDataProvider::PropertyMgr()const
 	{