--- a/syncmlfw/syncmlnotifier/src/SyncMLTimedInputTextQuery.cpp	Fri Mar 12 15:46:48 2010 +0200
+++ b/syncmlfw/syncmlnotifier/src/SyncMLTimedInputTextQuery.cpp	Mon Mar 15 12:43:15 2010 +0200
@@ -155,17 +155,17 @@
 //
 TBool CSyncMLTimedInputTextQuery::HandleQueryEditorStateEventL(CAknQueryControl* aQueryControl, TQueryControlEvent aEventType, TQueryValidationStatus aStatus)
 	{
- 
- 	if( EPhoneLayout == aQueryControl->QueryType() )
- 	 {
-		if (aEventType == EEmergencyCallAttempted)
+ 	if ( aQueryControl )
+  {
+ 		if( EPhoneLayout == aQueryControl->QueryType() )
+ 	 	{
+			if (aEventType == EEmergencyCallAttempted)
         	{
         	TryExitL(EEikBidCancel);
         	}
     	else
         	{
-        	if ( aQueryControl )
-         	{
+        	
          	TBuf<KSyncMLMaxDefaultResponseMsgLength> PhoneNo;
          	aQueryControl->GetText( PhoneNo );
          	TInt posplus = PhoneNo.LocateReverse('+');
@@ -177,10 +177,9 @@
            	{      
           	MakeLeftSoftkeyVisible(EFalse);
            	}
-         	}
-        
-        	}   
+         	}  
   	 }
+  }
  	else //For all other layouts 
  	 {
  	CAknQueryDialog::HandleQueryEditorStateEventL(aQueryControl,aEventType,aStatus);