--- a/bluetoothengine/btnotif/src/BTNObexPinNotifier.cpp	Sat Apr 24 00:12:05 2010 +0300
+++ b/bluetoothengine/btnotif/src/BTNObexPinNotifier.cpp	Sat Apr 24 00:30:17 2010 +0300
@@ -23,7 +23,7 @@
 #include "btnobexpinnotifier.h" // Own class definition
 #include "btNotifDebug.h"       // Debugging macros
 
-#include <SecondaryDisplay/BTnotifSecondaryDisplayAPI.h>
+#include <secondarydisplay/BTnotifSecondaryDisplayAPI.h>
 
 // ================= MEMBER FUNCTIONS =======================
 
@@ -84,17 +84,18 @@
         {
         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();
 
     FLOG(_L("[BTNOTIF]\t CBTObexPinNotifier::GetParamsL() completed"));