diff -r 106a4bfcb866 -r 013a02bf2bb0 smf/smfcredentialmgr/smfcredmgrclient/smfcredmgrclient.cpp
--- a/smf/smfcredentialmgr/smfcredmgrclient/smfcredmgrclient.cpp	Thu Aug 05 16:46:37 2010 +0530
+++ b/smf/smfcredentialmgr/smfcredmgrclient/smfcredmgrclient.cpp	Thu Aug 05 16:48:48 2010 +0530
@@ -38,8 +38,8 @@
 	if (!(Set.isEmpty() || URLList.isEmpty() || PluginList.isEmpty()
 			|| AuthAppId.isEmpty() || Validity.isNull()))
 		{
-		return (m_SmfClientPrivate->storeAuthDataL(Set, Validity, URLList,
-				PluginList, AuthAppId, Flag));
+		QT_TRAP_THROWING( return (m_SmfClientPrivate->storeAuthDataL(Set, Validity, URLList,
+				PluginList, AuthAppId, Flag)) );
 		}
 	else
 		{
@@ -57,7 +57,7 @@
 		}
 	else
 		{
-		m_SmfClientPrivate->authenticatedPluginListL(RegistrationToken, List);
+		QT_TRAP_THROWING( m_SmfClientPrivate->authenticatedPluginListL(RegistrationToken, List));
 		return List;
 		}
 	
@@ -68,7 +68,7 @@
 	QList<QUrl> List;
 	if (!(PluginID.isEmpty()))
 		{
-		m_SmfClientPrivate->URLListL(PluginID, List);
+		QT_TRAP_THROWING ( m_SmfClientPrivate->URLListL(PluginID, List) );
 		}
 	return List;
 	}
@@ -83,7 +83,7 @@
 	{
 	if (!(OldPluginID.isEmpty() || NewPluginID.isEmpty()))
 		{
-		m_SmfClientPrivate->changePluginIDListL(NewPluginID, Flag, OldPluginID);
+		QT_TRAP_THROWING (m_SmfClientPrivate->changePluginIDListL(NewPluginID, Flag, OldPluginID));
 		}
 	}
 
@@ -91,7 +91,7 @@
 	{
 	if (!(PluginID.isEmpty()))
 		{
-		return (m_SmfClientPrivate->isPluginAuthenticatedL(PluginID));
+		QT_TRAP_THROWING ( return (m_SmfClientPrivate->isPluginAuthenticatedL(PluginID)) );
 		}
 	else
 		{
@@ -104,7 +104,9 @@
 	{
 	if (!(RegToken.isEmpty() || Validity.isNull()))
 		{
-		if (m_SmfClientPrivate->AuthDataSetL(RegToken, Validity, AuthTokenSet))
+		TBool Flag = EFalse;
+		QT_TRAP_THROWING ( Flag = m_SmfClientPrivate->AuthDataSetL(RegToken, Validity, AuthTokenSet));
+		if (Flag)
 			return true;
 		}
 	else
@@ -119,7 +121,7 @@
 	{
 	if (!(KeyLabel.isEmpty() || keydata.isEmpty()) && Validity.isValid())
 		{
-		return (m_SmfClientPrivate->storeRSAKeysL(KeyLabel, keydata, Validity));
+		QT_TRAP_THROWING ( return (m_SmfClientPrivate->storeRSAKeysL(KeyLabel, keydata, Validity)) );
 		}
 	else
 		{
@@ -130,9 +132,10 @@
 		QString& Signature, SmfSignatureMethod AlgorithmUsed)
 	{
 	if (!(Message.isEmpty() || Key.isEmpty()))
-		return (m_SmfClientPrivate->signMessageL(Message, Key, Signature,
-				AlgorithmUsed));
-
+		{
+		QT_TRAP_THROWING ( return (m_SmfClientPrivate->signMessageL(Message, Key, Signature,
+				AlgorithmUsed)) );
+		}
 	else
 		{
 		return SmfErrBadParameter;