--- a/bluetoothengine/btnotif/src/BTNPBAPPinNotifier.cpp	Sat Apr 24 00:12:05 2010 +0300
+++ b/bluetoothengine/btnotif/src/BTNPBAPPinNotifier.cpp	Sat Apr 24 00:30:17 2010 +0300
@@ -31,7 +31,7 @@
 #include "btnpbappinnotifier.h" // own class definition
 #include "btNotifDebug.h"       // debugging macros
 
-#include <SecondaryDisplay/BTnotifSecondaryDisplayAPI.h>
+#include <secondarydisplay/BTnotifSecondaryDisplayAPI.h>
 
 // ================= MEMBER FUNCTIONS =======================
 
@@ -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();