--- a/datasourcemodules/locationapesuplpsy/src/suplpsyrequestor.cpp	Tue Aug 31 16:38:06 2010 +0300
+++ b/datasourcemodules/locationapesuplpsy/src/suplpsyrequestor.cpp	Wed Sep 01 12:35:25 2010 +0100
@@ -20,7 +20,7 @@
 // INCLUDE FILES
 #include <e32cmn.h>
 #include <centralrepository.h>
-#include <lbssuplpsyadaptation.h>
+#include <lbsSuplPsyAdaptation.h>
 #include "suplpsyrequestor.h"
 #include "suplpsygenericinfouser.h"
 #include "suplpsylogging.h"
@@ -67,12 +67,6 @@
     //TInt keyValue;
 
     TInt ret = repository->Get(KPSYTimeToNextFix, iTtnf);
-    
-    if (KErrNone != repository->Get(KPSYPmUid, iPmUid))
-        {
-        // Use default UID (SUPL Proxy PM)
-        iPmUid = 0x102871EC;
-        }
 
     delete repository;
     repository = NULL;
@@ -152,25 +146,30 @@
         {
 		//Get position info
 		TRACESTRING( "Extracting position... " )
-		HPositionGenericInfo* posInfo = static_cast < HPositionGenericInfo*> ( &aPosition );
+        HPositionGenericInfo* posInfo = static_cast < HPositionGenericInfo*> ( &aPosition );
 										
+		if ( aReason >= KErrNone )
+		    {
 	        //Set module Id
 	        iPositionInfo->SetModuleId( TUid::Uid( KSuplPsyImplUid ) );
-									        
+									            
 	        //Set time
-		TPosition pos;
-		posInfo->GetPosition( pos );
-		TTime now;
-		now.UniversalTime();
-		pos.SetTime( now );
-		iPositionInfo->SetPosition( pos );
-		iPrevFixSuccess = ETrue;
-
+		    TPosition pos;
+		    posInfo->GetPosition( pos );
+		    TTime now;
+		    now.UniversalTime();
+		    pos.SetTime( now );
+		    iPositionInfo->SetPosition( pos );
+		    iPrevFixSuccess = ETrue;
+		    //posInfo = NULL;
+		    }
+		else
+		    {
+		    //delete posInfo;
+		    //posInfo = NULL;
+		    iPrevFixSuccess = EFalse;
+		    }
         }
-	else
-		{
-		iPrevFixSuccess = EFalse;
-		}
     iObserver.CallBack();
     TRACESTRING( "CSuplPsyRequestor::OnLocationUpdate end" )
     }
@@ -200,7 +199,7 @@
     //Make location request
     iRequestId = GetRequestId();
 
-	const TUint KProtocolModuleUidValue = iPmUid;
+	const TUint KProtocolModuleUidValue = 0x102871EC;
     const TUid KProtocolModuleUid = { KProtocolModuleUidValue };
     iPsyAdaptation->RequestLocationUpdate(iRequestId, ETrue, KProtocolModuleUid); 
     if (iFirstReq)