diff -r f979ecb2b13e -r 42814f902fe6 searchfw/coresearchfw/server/src/searchserversession.cpp --- a/searchfw/coresearchfw/server/src/searchserversession.cpp Tue Feb 02 10:12:19 2010 +0200 +++ b/searchfw/coresearchfw/server/src/searchserversession.cpp Fri Feb 19 22:49:53 2010 +0200 @@ -855,13 +855,20 @@ CleanupClosePushL( readStream ); readStream.Open( searchContentDesPtr ); CSearchDocumentId* documentId = CSearchDocumentId::NewL(readStream); - TPtr8 launchInfoPtr = iSearchManager->GetLaunchInfoL( *documentId )->Des(); - aMessage.WriteL( 1, launchInfoPtr ); HBufC8* launchInfo = iSearchManager->GetLaunchInfoL( *documentId ); - delete launchInfo ; - launchInfo = NULL; - delete documentId; - documentId = NULL; + if( launchInfo ) + { + TPtr8 launchInfoPtr=launchInfo->Des(); + aMessage.WriteL( 1, launchInfoPtr ); + + delete launchInfo ; + launchInfo = NULL; + } + if( documentId ) + { + delete documentId; + documentId = NULL; + } CleanupStack::PopAndDestroy( &readStream ); CleanupStack::PopAndDestroy( searchContentDes ); }