--- a/mmsharing/mmshui/src/musuiactivetimer.cpp	Tue May 25 12:38:39 2010 +0300
+++ b/mmsharing/mmshui/src/musuiactivetimer.cpp	Wed Jun 09 09:37:52 2010 +0300
@@ -116,16 +116,30 @@
 void CMusUiActiveTimer::RunL()
     {
     MUS_LOG( "mus: [MUSUI ]  -> CMusUiActiveTimer::RunL" );
-    if (iStatus == KErrNone)
+    if (iObserver && iStatus == KErrNone)
         {
         iObserver->TimerComplete( this );
         }
     else
         {
-        User::Leave(iStatus.Int());
+        User::LeaveIfError(iStatus.Int());
         }
     MUS_LOG( "mus: [MUSUI ]  <- CMusUiActiveTimer::RunL" );
     }
 
+// -------------------------------------------------------------------------
+//  If RunL() leaves,It should be handled here.
+// -------------------------------------------------------------------------
+//
+TInt CMusUiActiveTimer::RunError( TInt aError )
+    {
+	MUS_LOG( "mus: [MUSUI ]  -> CMusUiActiveTimer::RunError" );
+    // Nothing can be done here.
+    aError = KErrNone;
+
+    MUS_LOG( "mus: [MUSUI ]  <- CMusUiActiveTimer::RunError" );
+    return aError;
+    }
+
 
 // end of file