--- a/messagingapp/msgappfw/utils/src/ccsdebug.cpp	Thu Jun 17 09:57:06 2010 +0100
+++ b/messagingapp/msgappfw/utils/src/ccsdebug.cpp	Thu Jul 22 16:32:06 2010 +0100
@@ -69,19 +69,14 @@
 	  	dbgArr = static_cast<CCsDebugArr*>( Dll::Tls() );
 	}
 
-    if ( dbgArr->IsEmpty() )
-    {
-        delete dbgArr;
-        Dll::SetTls( NULL );
-    }
-    else
+    if ( dbgArr && !(dbgArr->IsEmpty()) )
     {
     	CCsDebug* dbg = dbgArr->Pop();
 		dbg->UnMark(str);
 		delete dbg;			  	
     }
     
-    if ( !dbgArr && dbgArr->IsEmpty() )
+    if ( dbgArr && dbgArr->IsEmpty() )
     {
         delete dbgArr;
         Dll::SetTls( NULL );