--- a/phoneclientserver/phoneclient/Src/EmergencyNumber/EmergencyNumber_Aiw/CPhCltEmergencyCallImpl.cpp	Thu Aug 19 10:28:14 2010 +0300
+++ b/phoneclientserver/phoneclient/Src/EmergencyNumber/EmergencyNumber_Aiw/CPhCltEmergencyCallImpl.cpp	Tue Aug 31 15:45:17 2010 +0300
@@ -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,7 +82,10 @@
 void CPhCltEmergencyCallImpl::RunL()
     {
     // inform observer
-    iObserver->HandleEmergencyDialL( iStatus.Int() );
+    if(iObserver)
+        {
+        iObserver->HandleEmergencyDialL( iStatus.Int() );
+        }
     }
 
 // -----------------------------------------------------------------------------
@@ -105,8 +108,8 @@
     TBool& aIsEmergencyNumber )
     {
     return iEmergencyCall.IsEmergencyPhoneNumber( 
-    	aNumber, 
-    	aIsEmergencyNumber );
+        aNumber, 
+        aIsEmergencyNumber );
     }
 
 // -----------------------------------------------------------------------------
@@ -121,9 +124,9 @@
     {
    
     return iEmergencyCall.IsEmergencyPhoneNumber( 
-    	aNumber,
+        aNumber,
         aMatchedEmergencyNumber, 
-    	aIsEmergencyNumber );
+        aIsEmergencyNumber );
     }
 
 // -----------------------------------------------------------------------------
@@ -136,8 +139,8 @@
     TBool& aIsEmergencyNumber )
     {
     return iEmergencyCall.FindEmergencyPhoneNumber( 
-    	aNumber, 
-    	aIsEmergencyNumber );
+        aNumber, 
+        aIsEmergencyNumber );
     }
 
 // -----------------------------------------------------------------------------