--- a/networksecurity/tlsprovider/source/tlsprovider/CTlsProvider.cpp	Thu Sep 16 13:48:44 2010 +0530
+++ b/networksecurity/tlsprovider/source/tlsprovider/CTlsProvider.cpp	Thu Sep 23 17:23:35 2010 +0530
@@ -136,7 +136,7 @@
 	CTlsCryptoAttributes* tPtr = new (ELeave)CTlsCryptoAttributes;
 	CleanupStack::PushL(tPtr);
 	tPtr->iPublicKeyParams = new (ELeave)CTLSPublicKeyParams;
-	CleanupStack::Pop();
+	CleanupStack::Pop(tPtr);
 	return tPtr;
 	}
 
@@ -1267,9 +1267,10 @@
 	
 	case EGetSessionInterface:
 		{
+		if (iPtrTokenSearch)
 		iPtrTokenSearch->CancelRequest();
+		}
 		break;
-		}
 	case EGetCiphers:
 		{
 		if(iListAllTokensAndTypes[iCurrentTokentype].iProviderInterface)
@@ -1321,6 +1322,7 @@
 #ifdef _USESECDLGSV_
 		iDialogServ.Cancel();
 #else
+		if (iSecurityDialog)
 		iSecurityDialog->Cancel();
 #endif
 		}