--- a/phoneclientserver/phoneclient/Src/EmergencyNumber/EmergencyNumber_Aiw/CPhCltEmergencyCallImpl.cpp	Tue Aug 31 15:45:17 2010 +0300
+++ b/phoneclientserver/phoneclient/Src/EmergencyNumber/EmergencyNumber_Aiw/CPhCltEmergencyCallImpl.cpp	Wed Sep 01 12:15:03 2010 +0100
@@ -18,9 +18,9 @@
 
 
 // INCLUDE FILES
-#include "rphcltserver.h" 
-#include "cphcltemergencycallimpl.h" 
-#include "mphcltemergencycallobserver.h" 
+#include "RPhCltServer.h"
+#include "CPhCltEmergencyCallImpl.h"
+#include "MPhCltEmergencyCallObserver.h"
 
 _LIT( KEmNumber, "112" );
 
@@ -82,10 +82,7 @@
 void CPhCltEmergencyCallImpl::RunL()
     {
     // inform observer
-    if(iObserver)
-        {
-        iObserver->HandleEmergencyDialL( iStatus.Int() );
-        }
+    iObserver->HandleEmergencyDialL( iStatus.Int() );
     }
 
 // -----------------------------------------------------------------------------
@@ -108,8 +105,8 @@
     TBool& aIsEmergencyNumber )
     {
     return iEmergencyCall.IsEmergencyPhoneNumber( 
-        aNumber, 
-        aIsEmergencyNumber );
+    	aNumber, 
+    	aIsEmergencyNumber );
     }
 
 // -----------------------------------------------------------------------------
@@ -124,9 +121,9 @@
     {
    
     return iEmergencyCall.IsEmergencyPhoneNumber( 
-        aNumber,
+    	aNumber,
         aMatchedEmergencyNumber, 
-        aIsEmergencyNumber );
+    	aIsEmergencyNumber );
     }
 
 // -----------------------------------------------------------------------------
@@ -139,8 +136,8 @@
     TBool& aIsEmergencyNumber )
     {
     return iEmergencyCall.FindEmergencyPhoneNumber( 
-        aNumber, 
-        aIsEmergencyNumber );
+    	aNumber, 
+    	aIsEmergencyNumber );
     }
 
 // -----------------------------------------------------------------------------