--- a/calendarui/controller/src/calencontroller.cpp	Fri Feb 19 22:49:53 2010 +0200
+++ b/calendarui/controller/src/calencontroller.cpp	Fri Mar 12 15:42:35 2010 +0200
@@ -299,23 +299,55 @@
 // ----------------------------------------------------------------------------
 //
 CCalenController::~CCalenController()
-    {
+    {    
     TRACE_ENTRY_POINT;
+
+    if(iSystemTimeChangedMsgDelayer)
+        {
+        iSystemTimeChangedMsgDelayer->Cancel();
+        delete iSystemTimeChangedMsgDelayer;
+        iSystemTimeChangedMsgDelayer = NULL;
+        }
     
+    if(iAttachmentData)
+        {
+        delete iAttachmentData;
+        iAttachmentData = NULL;
+        }
+
+    if( iAlarmManager )
+        {
+        delete iAlarmManager;
+        }
+
+    if( iCustomisationManager )
+        {
+        delete iCustomisationManager;
+        }
+
+    if( iViewManager )
+        {
+        delete iViewManager;
+        }
+
+    if ( iSetting )
+        {
+        iSetting->Release();
+        }
+
+    if( iActionUi )
+        {
+        delete iActionUi;
+        }
+
     if ( iServices )
         {
         iServices->Release();
         }
-        
-    delete iActionUi;
-    delete iNotifier;
 
-    delete iViewManager;
-    delete iStateMachine;
-    
-    if ( iSetting )
+    if( iCmdLineLauncher )
         {
-        iSetting->Release();
+        delete iCmdLineLauncher;
         }
 
     if( iGlobalData )
@@ -323,31 +355,22 @@
         iGlobalData->Release();
         }
 
-    Dll::SetTls( NULL );
-
-    delete iCmdLineLauncher;
-    delete iCustomisationManager;
+    if( iNotifier )
+        {
+        delete iNotifier;
+        }
 
-    if( iResourceFileOffset )
-        {
-        CCoeEnv::Static()->DeleteResourceFile( iResourceFileOffset );
-        }
-    //delete iMultipleDbmanager;
-    
-    if(iSystemTimeChangedMsgDelayer)
+    if( iStateMachine )
         {
-        iSystemTimeChangedMsgDelayer->Cancel();
-        delete iSystemTimeChangedMsgDelayer;
-        iSystemTimeChangedMsgDelayer = NULL;
+        delete iStateMachine;
         }
+
+   if( iResourceFileOffset )
+       {
+       CCoeEnv::Static()->DeleteResourceFile( iResourceFileOffset );
+       }
+    Dll::SetTls( NULL );
     
-    delete iAlarmManager;
-    
-    if(iAttachmentData)
-        {
-        delete iAttachmentData;
-        iAttachmentData = NULL;
-        }
     TRACE_EXIT_POINT;
     }