--- a/coreapplicationuis/SysAp/Src/sysapdefaultkeyhandler.cpp	Wed Sep 15 12:23:15 2010 +0300
+++ b/coreapplicationuis/SysAp/Src/sysapdefaultkeyhandler.cpp	Wed Oct 13 14:43:04 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2006-2008 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -197,10 +197,10 @@
                 RProperty::Set( KPSUidHWRM, KHWRMGripStatus, EPSHWRMGripOpen );
                 iKeypadWasLocked = iKeylock->IsKeyLockEnabled();
                 iKeylockPolicy->DisableKeyguardFeature();
+                iKeylock->DisableKeyLock();
                 if (!IsDeviceLocked())
                     {
                     iCallback.ExecCommandL( MSysapCallback::EResetKeyguardState );
-                    iKeylock->DisableKeyLock();
                     iCallback.ExecCommandL( MSysapCallback::ECancelPowermenu );
                     }
                 // apply default light control
@@ -235,9 +235,8 @@
 								case EPSCTsyCallStateUninitialized:
 								case EPSCTsyCallStateNone:
 									{
-    
-									TInt keyGuardSetting;
-									User::LeaveIfError(iSlideRepository->Get( KSlideKeyguard, keyGuardSetting ));
+                 	TInt keyGuardSetting;
+									iSlideRepository->Get( KSlideKeyguard, keyGuardSetting );
 									switch( ( TSlideSettingKeyguard ) keyGuardSetting )
 										{
 										case ESlideSettingsKeyguardActivatingOn: