--- a/featuremgmt/featuremgr/src/serverexe/featmgrfeatureregistry.cpp	Mon Jun 21 17:37:53 2010 +0300
+++ b/featuremgmt/featuremgr/src/serverexe/featmgrfeatureregistry.cpp	Thu Aug 19 11:36:21 2010 +0300
@@ -269,10 +269,15 @@
     
     if( iSWIProcessId == aPrcId && iSWICacheFeature )
     	{
-		TBitFlags32 flags(0);
-    	flags.Assign( EFeatureSupported, aEnable );
-    	TFeatureServerEntry entry( aFeature, flags, *aData );    
-	    err = SWICacheCommand(ESWISetFeatAndData, entry);
+        TBitFlags32 flags(0);
+        flags.Assign( EFeatureSupported, aEnable );
+        TUint32 data = 0;
+        if( aData )
+            {
+            data = *aData;
+            }
+        TFeatureServerEntry entry( aFeature, flags, data );    
+        err = SWICacheCommand(ESWISetFeatAndData, entry);
     	}
     else 
     	{