--- a/featuremgmt/featuremgr/src/clientdll/featurecontrol.cpp	Mon Mar 15 12:46:30 2010 +0200
+++ b/featuremgmt/featuremgr/src/clientdll/featurecontrol.cpp	Thu Apr 01 00:19:42 2010 +0300
@@ -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"
@@ -75,7 +75,13 @@
         
         if ( err == KErrNone )
             {
-            Dll::SetTls( tlsData );
+            err = Dll::SetTls( tlsData );
+            if (err != KErrNone)
+                {
+                delete tlsData;
+                ERROR_LOG1( "RFeatureControl::Open SetTls error %d ", err );
+				return err;
+                }
             }
         else
             {