--- a/harvester/composerplugins/imagecomposer/src/composerimageplugin.cpp	Wed Sep 15 12:40:59 2010 +0300
+++ b/harvester/composerplugins/imagecomposer/src/composerimageplugin.cpp	Wed Oct 13 15:02:02 2010 +0300
@@ -48,13 +48,10 @@
     WRITELOG( "CComposerImagePlugin::~CComposerImagePlugin()" );
 
     delete iImageComposerAO;
-    iImageComposerAO = NULL;
     delete iLocationRelationObserver;
-    iLocationRelationObserver = NULL;
     delete iImagePresentObserver;
-    iImagePresentObserver = NULL;
+    
     delete iMdEHarvesterSession;
-    iMdEHarvesterSession = NULL;
     }
 
 // ---------------------------------------------------------------------------
@@ -88,15 +85,11 @@
     {
     WRITELOG( "CComposerImagePlugin::SetObservers()" );
 
-#ifdef _DEBUG
     TRAPD( err, SetObserversL() );
     if ( err != KErrNone )
         {
         WRITELOG1( "CComposerImagePlugin::SetObservers Error: %d", err );
         }
-#else
-    TRAP_IGNORE( SetObserversL() );    
-#endif
     }
 
 // ---------------------------------------------------------------------------