--- a/harvester/composerplugins/imagecomposer/src/composerimageplugin.cpp	Tue Jul 06 14:44:37 2010 +0300
+++ b/harvester/composerplugins/imagecomposer/src/composerimageplugin.cpp	Fri Sep 17 16:54:49 2010 +0300
@@ -48,10 +48,13 @@
     WRITELOG( "CComposerImagePlugin::~CComposerImagePlugin()" );
 
     delete iImageComposerAO;
+    iImageComposerAO = NULL;
     delete iLocationRelationObserver;
+    iLocationRelationObserver = NULL;
     delete iImagePresentObserver;
-    
+    iImagePresentObserver = NULL;
     delete iMdEHarvesterSession;
+    iMdEHarvesterSession = NULL;
     }
 
 // ---------------------------------------------------------------------------
@@ -85,11 +88,15 @@
     {
     WRITELOG( "CComposerImagePlugin::SetObservers()" );
 
+#ifdef _DEBUG
     TRAPD( err, SetObserversL() );
     if ( err != KErrNone )
         {
         WRITELOG1( "CComposerImagePlugin::SetObservers Error: %d", err );
         }
+#else
+    TRAP_IGNORE( SetObserversL() );    
+#endif
     }
 
 // ---------------------------------------------------------------------------