--- a/bluetoothengine/btnotif/src/BTNPBAPPinNotifier.cpp	Tue Feb 02 00:20:42 2010 +0200
+++ b/bluetoothengine/btnotif/src/BTNPBAPPinNotifier.cpp	Fri Feb 19 22:59:18 2010 +0200
@@ -92,16 +92,17 @@
         {
         User::Leave(KErrInUse);
         }
-    else if ( AutoLockOnL() )
+    
+    iMessage = aMessage;
+    iReplySlot = aReplySlot;
+    
+    if ( AutoLockOnL() )
         {
         // The phone is locked, access denied.
         //
         CompleteMessage(KErrCancel);
         return;
         }
-        
-    iMessage = aMessage;
-    iReplySlot = aReplySlot;
 
     ShowNoteCompleteMessageL();