--- a/featuremgmt/featuremgr/src/clientdll/featmgr.cpp	Mon Sep 27 11:59:56 2010 +0100
+++ b/featuremgmt/featuremgr/src/clientdll/featmgr.cpp	Tue Oct 19 16:26:13 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -40,7 +40,13 @@
 
     if ( !Dll::Tls() )
         {
-        Dll::SetTls( CFeatMgrTlsData::NewL() );
+    	CFeatMgrTlsData* fmgrData = CFeatMgrTlsData::NewL();
+    	TInt err = Dll::SetTls(fmgrData);
+    	if(err != KErrNone)
+    		{
+    		delete fmgrData;
+    		User::Leave(err);
+    		}
         }
 
 	// Increase the client count (self)