--- a/contextengine/plugins/calendarplugin/src/CalendarContextPlugin.cpp	Tue Jul 06 14:44:37 2010 +0300
+++ b/contextengine/plugins/calendarplugin/src/CalendarContextPlugin.cpp	Fri Sep 17 16:54:49 2010 +0300
@@ -89,12 +89,15 @@
 	{
 	WRITELOG( "CCalendarContextPlugin::~CCalendarContextPlugin -- ENTER" );
 	delete iCalInstanceView;
+	iCalInstanceView = NULL;
 	delete iCalSession;
+	iCalSession = NULL;
 	
 	if( iInitTimer )
 	    {
 	    iInitTimer->Cancel();
 	    delete iInitTimer;
+	    iInitTimer = NULL;
 	    }
 		
 	WRITELOG( "CCalendarContextPlugin::~CCalendarContextPlugin -- RETURN" );
@@ -366,11 +369,15 @@
 			}
 
 		WRITELOG( "CCalendarContextPlugin::AddMetaDataL - Add calendar relation to MDE" );
+#ifdef _DEBUG
 		TRAP( addError, iMdeSession->AddRelationL( *relationObject ) );
 		if ( addError != KErrNone)
 			{
 			WRITELOG1( "CCalendarContextPlugin::AddMetaDataL - Add calendar relation to MDE error: %d", addError );
 			}
+#else
+		TRAP_IGNORE( iMdeSession->AddRelationL( *relationObject ) );	
+#endif
 
 		CleanupStack::PopAndDestroy( relationObject );
 		CleanupStack::PopAndDestroy( calendarObject );
@@ -516,7 +523,6 @@
 void CCalendarContextPlugin::StartRetryL()
     {
     WRITELOG( "CCalendarContextPlugin::StartRetryL() ENTER" );
-    TInt err(KErrNone);
     
     if(iRetryCount++ > KMaxRetryCount)
         {
@@ -535,10 +541,11 @@
 		return; 
         }
     
-    
+#ifdef _DEBUG
+    TInt err( KErrNone );
     if(!iInitTimer)
         {
-        TRAP(err, iInitTimer = CPeriodic::NewL(CActive::EPriorityStandard) );
+        TRAP(err, iInitTimer = CPeriodic::NewL( CActive::EPriorityStandard ) );
         }
                 
     if( err != KErrNone )
@@ -546,7 +553,13 @@
         WRITELOG1( "CCalendarContextPlugin::OpenViewL() iInitTimer->Start failed %d", err );
         User::Leave( err );
         }
-        
+#else
+    if(!iInitTimer)
+        {
+        iInitTimer = CPeriodic::NewL( CActive::EPriorityStandard );
+        }    
+#endif
+    
     WRITELOG( "CCalendarContextPlugin::OpenViewL() iInitTimer->Start" );
     iInitTimer->Start( KInitRetryTimeout, KInitRetryTimeout, TCallBack(InitRetryCallback, this));
     WRITELOG( "CCalendarContextPlugin::StartRetryL() RETURN" );