--- a/phoneclientserver/phoneserver/Src/Standard/CPhSrvSession.cpp	Tue Aug 31 15:45:17 2010 +0300
+++ b/phoneclientserver/phoneserver/Src/Standard/CPhSrvSession.cpp	Wed Sep 01 12:15:03 2010 +0100
@@ -18,11 +18,11 @@
 
 
 // INCLUDE FILES
-#include "cphsrvserver.h" 
-#include "cphsrvsession.h" 
-#include "cphsrvsubsessionbase.h" 
-#include "phsrvsubsessionfactory.h" 
-#include "phcltclientserver.h" 
+#include "CPhSrvServer.h"
+#include "CPhSrvSession.h"
+#include "CPhSrvSubSessionBase.h"
+#include "PhSrvSubSessionFactory.h"
+#include "PhCltClientServer.h"
 
 // CONSTANTS
 
@@ -60,6 +60,7 @@
 // Destructor.
 // -----------------------------------------------------------------------------
 //
+
 CPhSrvSession::~CPhSrvSession()
     {
     if ( iServer )
@@ -68,9 +69,10 @@
         }
 
     delete iObjectIx;
-   
-   if ( iContainer )
+
+    if ( iContainer )
         {
+        //coverity[var_deref_model]
         iServer->RemoveContainer( iContainer );
         iContainer = NULL;
         }
@@ -181,18 +183,18 @@
         
         if ( subSession )
             {
-            // Check that the subsession can handle this request
-            if ( !subSession->PhSrvMessageDecoderCanProcessMessage( function ) )
-                {
-                PanicClient(
-                    aMessage,
-                    EPhCltServerInitiatedPanicInvalidHandle );
-                }
-            else
-                {
-                // Get it to process this request
-                subSession->PhSrvMessageProcessorHandleMessageL( aMessage );
-                }
+	        // Check that the subsession can handle this request
+	        if ( !subSession->PhSrvMessageDecoderCanProcessMessage( function ) )
+	            {
+	            PanicClient(
+	                aMessage,
+	                EPhCltServerInitiatedPanicInvalidHandle );
+	            }
+	        else
+	            {
+	            // Get it to process this request
+	            subSession->PhSrvMessageProcessorHandleMessageL( aMessage );
+	            }
             }            
         }
     }