--- a/syncmlfw/common/sosserver/src/nsmlsossession.cpp	Thu Aug 19 10:44:50 2010 +0300
+++ b/syncmlfw/common/sosserver/src/nsmlsossession.cpp	Tue Aug 31 16:04:06 2010 +0300
@@ -461,6 +461,7 @@
     if ( !iDMAuthInfo )
         {
         aMessage.Complete( KErrNotFound );
+         _DBG_FILE("CNSmlSOSSession::GetDMAuthInfoL(): iDMAuthInfo is NULL");
         return;
         }
     aMessage.WriteL( 0, iDMAuthInfo->Ptr(0), 0 );
@@ -2235,16 +2236,16 @@
             break;               
             };
         
-	   	if ( buf )  
-	   	    { 
-                if ( iHandler->CompleteBufProgressMsg( *buf, this )) // if owner not found do not remove from buffer
-                    {
-                    iProgressEventBuffer.Remove(0);        
-                    }  
-                    
-                delete buf;
-                buf = NULL; 
-	   	    }   
+	   	        
+        if ( iHandler->CompleteBufProgressMsg( *buf, this )) // if owner not found do not remove from buffer
+            {
+            iProgressEventBuffer.Remove(0);        
+            }  
+            
+        delete buf;
+        buf = NULL;   
+        
+        
         }
     
     if ( !mutexError )
@@ -2309,16 +2310,14 @@
             iProgressEventBuffer.Remove(0);        
             }  
         */
-        if ( buf ) 
-          {     
-            if ( iHandler->CompleteBufContactSuiteProgressMsg( *buf, this )) // if owner not found do not remove from buffer
-                {
-                    iContactSuiteProgressEventBuffer.Remove(0);        
-                }  
+		if ( iHandler->CompleteBufContactSuiteProgressMsg( *buf, this )) // if owner not found do not remove from buffer
+            {
+            iContactSuiteProgressEventBuffer.Remove(0);        
+            }  
 
-            delete buf;
-            buf = NULL;   
-          } 
+        delete buf;
+        buf = NULL;   
+        
         
         }