--- a/uifw/AvKon/src/AknQueryControl.cpp	Tue Apr 27 16:55:05 2010 +0300
+++ b/uifw/AvKon/src/AknQueryControl.cpp	Tue May 11 16:27:42 2010 +0300
@@ -237,8 +237,11 @@
         if ( iParent->QueryType() == EPinLayout )
             {
             _AKNTRACE( "[%s][%s] ", "RevealSecretText( EFalse )", __FUNCTION__);
-            static_cast<CAknNumericSecretEditor*>
-                ( iParent->ControlByLayoutOrNull( EPinLayout ) )->RevealSecretText( EFalse );
+            if( iParent->ControlByLayoutOrNull( EPinLayout ) )
+            	{
+				static_cast<CAknNumericSecretEditor*>
+					( iParent->ControlByLayoutOrNull( EPinLayout ) )->RevealSecretText( EFalse );
+            	}
             }
         }